Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: implement --shard option #12546

Merged
merged 54 commits into from
Mar 6, 2022
Merged
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
3052d3b
feat: implement --shard option #6270
marionebl Mar 3, 2022
9a02991
fix: remove unneeded optional chain
marionebl Mar 4, 2022
1bdab88
fix: validate shard option in runJest too
marionebl Mar 4, 2022
edcd51b
fix: simplify .shard control flow
marionebl Mar 4, 2022
8a6d66f
test: add shard e2e test
marionebl Mar 4, 2022
fc7574d
ci: try dogfooding on circleci
marionebl Mar 4, 2022
d524ecf
test: fix failing test
marionebl Mar 4, 2022
392f2f2
docs: add changelog entry
marionebl Mar 4, 2022
d507ae5
ci: simplify circleci config
marionebl Mar 4, 2022
002e9d5
Apply formatting suggestion
marionebl Mar 5, 2022
17a2f41
Grammar fix
marionebl Mar 5, 2022
c2cc758
fix: validate only once
marionebl Mar 5, 2022
9136939
test: cover negative number validation
marionebl Mar 5, 2022
0e27779
test: add clarifying comment
marionebl Mar 5, 2022
abe7806
test: throw if sharding on non-shardin test sequencer
marionebl Mar 5, 2022
a205153
ci: use actions matrix
marionebl Mar 5, 2022
6f1631d
docs: x-reference between shard and testSequencer
marionebl Mar 5, 2022
f558cd9
feat: use jump consistent hashing
marionebl Mar 5, 2022
1effb45
docs: fix typo
marionebl Mar 5, 2022
3f38e3a
docs: contract
marionebl Mar 5, 2022
61536d8
docs: no relative marker
marionebl Mar 5, 2022
d0366ef
docs: fix typo
marionebl Mar 5, 2022
e598dad
fix: remove unneeded guard
marionebl Mar 5, 2022
e045336
fix: clean up debris
marionebl Mar 5, 2022
1ef0f95
fix: apply format
marionebl Mar 5, 2022
42f5276
style: apply formatting
marionebl Mar 5, 2022
4cc8728
feat: use sha1 for test spreading
marionebl Mar 5, 2022
d8e69b4
test: relax assertions regarding ordering
marionebl Mar 5, 2022
d3cebc4
ci: use matrix parameter
marionebl Mar 5, 2022
6f2a633
ci: chard correct execution
marionebl Mar 5, 2022
2986f1d
feat: replace hardcoded shard config
marionebl Mar 5, 2022
2a08e13
fix: remove snapshot checkins
marionebl Mar 5, 2022
8b60f60
docs: add missing copyright headers
marionebl Mar 5, 2022
dcb6706
Merge branch 'main' into 6270
SimenB Mar 5, 2022
2aed48b
move changelog
SimenB Mar 5, 2022
1b61239
rename
SimenB Mar 5, 2022
9316f6f
doc tweaks
SimenB Mar 5, 2022
2ba718e
tweak test
SimenB Mar 5, 2022
fe1eb34
tweak spacing in cli args descriptions
SimenB Mar 5, 2022
734748e
strings, not regex, in test
SimenB Mar 5, 2022
8fbace8
remove inferred type annotation
SimenB Mar 5, 2022
a542b82
Update docs/CLI.md
SimenB Mar 5, 2022
0d4fb3f
Update docs/Configuration.md
SimenB Mar 5, 2022
062a80c
use relative path in hash
SimenB Mar 5, 2022
3362237
lockfile
SimenB Mar 5, 2022
74b1a0c
localeCompare, not number conversion
SimenB Mar 5, 2022
798fd40
unit test
SimenB Mar 5, 2022
128047f
type errors in test
SimenB Mar 5, 2022
6facf86
oops
SimenB Mar 5, 2022
be17873
move docs and mention in troubleshooting
SimenB Mar 5, 2022
70d073f
maybe?
SimenB Mar 5, 2022
3748808
compare manually
SimenB Mar 5, 2022
75014e9
maybe
SimenB Mar 6, 2022
a2bb729
shard coverage run
SimenB Mar 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,28 @@ jobs:
type: string
working_directory: ~/jest
executor: node/default
parallelism: 4
steps:
- checkout
- node/install:
node-version: << parameters.node-version >>
- node/install-packages: *install
- run:
command: yarn test-ci-partial
command: yarn test-ci-partial --shard=$(expr $CIRCLE_NODE_INDEX + 1)/$CIRCLE_NODE_TOTAL
- store_test_results:
path: reports/junit

test-jest-jasmine:
working_directory: ~/jest
executor: node/default
parallelism: 4
steps:
- checkout
- node/install:
node-version: lts/*
- node/install-packages: *install
- run:
command: JEST_JASMINE=1 yarn test-ci-partial && JEST_JASMINE=1 yarn test-leak
command: JEST_JASMINE=1 yarn test-ci-partial --shard=$(expr $CIRCLE_NODE_INDEX + 1)/$CIRCLE_NODE_TOTAL && JEST_JASMINE=1 yarn test-leak
- store_test_results:
path: reports/junit

Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ jobs:
run: yarn lint:prettier:ci
- name: check copyright headers
run: yarn check-copyright-headers

test:
name: Node v${{ matrix.node-version }} on ${{ matrix.os }}
name: Node v${{ matrix.node-version }} on ${{ matrix.os }} (${{ matrix.shard }})
strategy:
fail-fast: false
matrix:
node-version: [12.x, 14.x, 16.x, 17.x]
os: [ubuntu-latest, macOS-latest, windows-latest]
shard: ['1/4', '2/4', '3/4', '4/4']
runs-on: ${{ matrix.os }}
needs: prepare-yarn-cache

Expand All @@ -96,14 +98,15 @@ jobs:
id: cpu-cores
uses: SimenB/github-actions-cpu-cores@v1
- name: run tests
run: yarn test-ci-partial:parallel --max-workers ${{ steps.cpu-cores.outputs.count }}
run: yarn test-ci-partial:parallel --max-workers ${{ steps.cpu-cores.outputs.count }} --shard=${{ matrix.shard }}

test-jasmine:
name: Node LTS on ${{ matrix.os }} using jest-jasmine2
name: Node LTS on ${{ matrix.os }} using jest-jasmine2 (${{ matrix.shard }})
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
shard: ['1/4', '2/4', '3/4', '4/4']
runs-on: ${{ matrix.os }}
needs: prepare-yarn-cache

Expand All @@ -128,7 +131,7 @@ jobs:
id: cpu-cores
uses: SimenB/github-actions-cpu-cores@v1
- name: run tests using jest-jasmine
run: yarn jest-jasmine-ci --max-workers ${{ steps.cpu-cores.outputs.count }}
run: yarn jest-jasmine-ci --max-workers ${{ steps.cpu-cores.outputs.count }} --shard=${{ matrix.shard }}

test-coverage:
name: Node LTS on Ubuntu with coverage
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- `[expect]` Expose `AsymmetricMatchers`, `MatcherFunction` and `MatcherFunctionWithState` interfaces ([#12363](https://github.com/facebook/jest/pull/12363), [#12376](https://github.com/facebook/jest/pull/12376))
- `[jest-circus, jest-jasmine2]` Allowed classes and functions as `describe` and `it`/`test` names ([#12484](https://github.com/facebook/jest/pull/12484))
- `[jest-cli, jest-config]` [**BREAKING**] Remove `testURL` config, use `testEnvironmentOptions.url` instead ([#10797](https://github.com/facebook/jest/pull/10797))
- `[jest-cli, jest-core]` Add `--shard` parameter for distributed parallel test execution ([#12546](https://github.com/facebook/jest/pull/12546))
- `[jest-config]` [**BREAKING**] Stop shipping `jest-environment-jsdom` by default ([#12354](https://github.com/facebook/jest/pull/12354))
- `[jest-config]` [**BREAKING**] Stop shipping `jest-jasmine2` by default ([#12355](https://github.com/facebook/jest/pull/12355))
- `[jest-config, @jest/types]` Add `ci` to `GlobalConfig` ([#12378](https://github.com/facebook/jest/pull/12378))
Expand Down
14 changes: 13 additions & 1 deletion docs/CLI.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,18 @@ Run only the tests of the specified projects. Jest uses the attribute `displayNa

A list of paths to modules that run some code to configure or to set up the testing framework before each test. Beware that files imported by the setup scripts will not be mocked during testing.

### `--shard`
marionebl marked this conversation as resolved.
Show resolved Hide resolved

Shard suite to execute them on multiple machines. For example, to split the suite into three shards, each running one third of the tests:

```
jest --shard=1/3
jest --shard=2/3
jest --shard=3/3
```

Please refer to [shard configuration](Configuration.md#shard).

### `--showConfig`

Print your Jest config and then exits.
Expand Down Expand Up @@ -389,7 +401,7 @@ Lets you specify a custom test runner.

### `--testSequencer=<path>`

Lets you specify a custom test sequencer. Please refer to the documentation of the corresponding configuration property for details.
Lets you specify a custom test sequencer. Please refer to the [`testSequencer` configuration](Configuration.md#testsequencer-string) for details.

### `--testTimeout=<number>`

Expand Down
38 changes: 37 additions & 1 deletion docs/Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,18 @@ Example `jest.setup.js` file
jest.setTimeout(10000); // in milliseconds
```

### `shard` \[string]

The test suite shard to execute in a format of `(?<shardIndex>\d+)/(?<shardCount>\d+)`.

`shardIndex` describes which shard to select while `shardCount` controls the number of shards the suite should be split into.

`shardIndex` and `shardCount` have to be 1-based, positive numbers, and `shardIndex` has to be lower than or equal to `shardCount`.

When `shard` is specified the configured [`testSquencer`](#testsequencer-string) implementation has to implement a `shard` method.

Refer to [`testSquencer`](#testsequencer-string) on how to override the default sharding implementation.

### `slowTestThreshold` \[number]

Default: `5`
Expand Down Expand Up @@ -1327,7 +1339,13 @@ An example of such function can be found in our default [jasmine2 test runner pa

Default: `@jest/test-sequencer`

This option allows you to use a custom sequencer instead of Jest's default. `sort` may optionally return a Promise.
This option allows you to use a custom sequencer instead of Jest's default.

:::tip

Both `sort` and `shard` may optionally return a `Promise`.

:::

Example:

Expand All @@ -1337,6 +1355,24 @@ Sort test path alphabetically.
const Sequencer = require('@jest/test-sequencer').default;

class CustomSequencer extends Sequencer {
/**
* Select tests for shard requested via --shard=shardIndex/shardCount
* Sharding is applied before sorting
*/
shard(tests, {shardIndex, shardCount}) {
const shardSize = Math.ceil(tests.length / options.shardCount);
const shardStart = shardSize * (options.shardIndex - 1);
const shardEnd = shardSize * options.shardIndex;

return [...tests]
.sort((a, b) => (a.path > b.path ? 1 : -1))
.slice(shardStart, shardEnd);
}

/**
* Sort test to determine order of execution
* Sorting is applied after sharding
*/
sort(tests) {
// Test structure information
// https://github.com/facebook/jest/blob/6b8b1404a1d9254e7d5d90a8934087a9c9899dab/packages/jest-runner/src/types.ts#L17-L21
Expand Down
86 changes: 86 additions & 0 deletions e2e/__tests__/shard.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import * as path from 'path';
import runJest from '../runJest';

test('--shard=1/1', () => {
const result = runJest('shard', ['--shard=1/1', '--listTests']);

const paths = result.stdout
.split('\n')
.filter(Boolean)
.map(file => path.basename(file))
.sort();

expect(paths).toEqual(['1.test.js', '2.test.js', '3.test.js']);
});

test('--shard=1/2', () => {
const result = runJest('shard', ['--shard=1/2', '--listTests']);

const paths = result.stdout
.split('\n')
.filter(Boolean)
.map(file => path.basename(file))
.sort();

expect(paths).toEqual(['2.test.js', '3.test.js']);
});

test('--shard=2/2', () => {
const result = runJest('shard', ['--shard=2/2', '--listTests']);

const paths = result.stdout
.split('\n')
.filter(Boolean)
.map(file => path.basename(file));

expect(paths).toEqual(['1.test.js']);
});

test('--shard=4/4', () => {
const result = runJest('shard', ['--shard=4/4', '--listTests']);

const paths = result.stdout
.split('\n')
.filter(Boolean)
.map(file => path.basename(file));

// project only has 3 files
// shards > 3 are empty
expect(paths).toEqual([]);
marionebl marked this conversation as resolved.
Show resolved Hide resolved
});

test('--shard=1/2 custom non-sharding test sequencer', () => {
const result = runJest('shard', [
'--shard=1/2',
'--listTests',
'--testSequencer=./no-sharding-test-sequencer.js',
]);

expect(result).toMatchObject({
failed: true,
stderr: expect.stringMatching(
/Shard (.*) requested, but test sequencer (.*) in (.*) has no shard method./,
),
});
});

test('--shard=1/2 custom sharding test sequencer', () => {
const result = runJest('shard', [
'--shard=1/2',
'--listTests',
'--testSequencer=./sharding-test-sequencer.js',
]);

const paths = result.stdout
.split('\n')
.filter(Boolean)
.map(file => path.basename(file));

expect(paths).toEqual(['3.test.js']);
});
13 changes: 13 additions & 0 deletions e2e/shard/__tests__/1.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
'use strict';

test('1-1', () => expect(2).toBe(2));

test('1-2', () => expect(2).toBe(2));

test('1-3', () => expect(2).toBe(2));
13 changes: 13 additions & 0 deletions e2e/shard/__tests__/2.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
'use strict';

test('2-1', () => expect(2).toBe(2));

test('2-2', () => expect(2).toBe(2));

test('2-3', () => expect(2).toBe(2));
13 changes: 13 additions & 0 deletions e2e/shard/__tests__/3.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
'use strict';

test('3-1', () => expect(2).toBe(2));

test('3-2', () => expect(2).toBe(2));

test('3-3', () => expect(2).toBe(2));
11 changes: 11 additions & 0 deletions e2e/shard/no-sharding-test-sequencer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
module.exports = class NoShardingSequencer {
sort(tests) {
return tests;
}
};
5 changes: 5 additions & 0 deletions e2e/shard/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"jest": {
"testEnvironment": "node"
}
}
14 changes: 14 additions & 0 deletions e2e/shard/sharding-test-sequencer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
module.exports = class NoShardingSequencer {
shard(tests) {
return [tests[2]];
}
sort(tests) {
return tests;
}
};
Loading