Skip to content

Commit

Permalink
Improve test stability by getting independent of module id ordering i…
Browse files Browse the repository at this point in the history 
…n more places (#4401)

* Improve test stability by getting independent of module id ordering in more places

* Make test file reads slower in parallel read tests
  • Loading branch information
@lukastaegert
lukastaegert committed Feb 14, 2022
1 parent 1d76887 commit 16c3b24
Show file tree
Hide file tree
Showing 14 changed files with 272 additions and 251 deletions.
37 changes: 18 additions & 19 deletions test/function/samples/custom-module-options/_config.js
View file
@@ -1,4 +1,5 @@
const assert = require('assert');
const { getObject } = require('../../../utils');

function getTestPlugin(index) {
const pluginName = `test-${index}`;
Expand Down Expand Up @@ -40,28 +41,26 @@ module.exports = {
name: 'wrap-up',
buildEnd() {
assert.deepStrictEqual(
[...this.getModuleIds()]
.filter(id => id.includes('resolve'))
.sort()
.map(id => ({ id, meta: this.getModuleInfo(id).meta })),
[
{
id: 'resolve1-load2-transform3',
meta: {
'test-1': { resolved: 1 },
'test-2': { loaded: 2 },
'test-3': { transformed: 3 }
}
getObject(
[...this.getModuleIds()]
.filter(id => id.includes('resolve'))
.map(id => [id, this.getModuleInfo(id).meta])
),
{
'resolve1-load2-transform3': {
'test-1': { resolved: 1 },
'test-2': { loaded: 2 },
'test-3': { transformed: 3 }
},
{
id: 'resolve2-load2-transform3',
meta: { 'test-2': { loaded: 2 }, 'test-3': { transformed: 3 } }
'resolve2-load2-transform3': {
'test-2': { loaded: 2 },
'test-3': { transformed: 3 }
},
{
id: 'resolve3-load3-transform1-transform3',
meta: { 'test-3': { transformed: 3 }, 'test-1': { transformed: 1 } }
'resolve3-load3-transform1-transform3': {
'test-3': { transformed: 3 },
'test-1': { transformed: 1 }
}
]
}
);
}
}
Expand Down
17 changes: 10 additions & 7 deletions test/function/samples/deprecated/manual-chunks-info/_config.js
View file
@@ -1,5 +1,6 @@
const assert = require('assert');
const path = require('path');
const { getObject } = require('../../../../utils');

function getId(name) {
return path.join(__dirname, `${name}.js`);
Expand All @@ -13,9 +14,11 @@ module.exports = {
output: {
manualChunks(id, { getModuleIds, getModuleInfo }) {
assert.deepStrictEqual(
JSON.parse(JSON.stringify([...getModuleIds()].sort().map(id => getModuleInfo(id)))),
[
{
getObject(
[...getModuleIds()].map(id => [id, JSON.parse(JSON.stringify(getModuleInfo(id)))])
),
{
[getId('dynamic')]: {
id: getId('dynamic'),
ast: {
type: 'Program',
Expand Down Expand Up @@ -107,7 +110,7 @@ module.exports = {
meta: {},
syntheticNamedExports: false
},
{
[getId('lib')]: {
id: getId('lib'),
ast: {
type: 'Program',
Expand Down Expand Up @@ -140,7 +143,7 @@ module.exports = {
meta: {},
syntheticNamedExports: false
},
{
[getId('main')]: {
id: getId('main'),
ast: {
type: 'Program',
Expand Down Expand Up @@ -261,7 +264,7 @@ module.exports = {
meta: {},
syntheticNamedExports: false
},
{
external: {
id: 'external',
ast: null,
code: null,
Expand All @@ -281,7 +284,7 @@ module.exports = {
meta: {},
syntheticNamedExports: false
}
]
}
);
}
}
Expand Down
53 changes: 26 additions & 27 deletions test/function/samples/deprecated/resolve-id-external/_config.js
View file
@@ -1,6 +1,7 @@
const assert = require('assert');
const path = require('path');
const sideEffects = [];
const { getObject } = require('../../../../utils');

module.exports = {
description: 'does not include modules without used exports if moduleSideEffect is false',
Expand Down Expand Up @@ -47,33 +48,31 @@ module.exports = {
},
buildEnd() {
assert.deepStrictEqual(
Array.from(this.getModuleIds())
.filter(id => !path.isAbsolute(id))
.sort()
.map(id => ({ id, hasModuleSideEffects: this.getModuleInfo(id).hasModuleSideEffects })),
[
{ id: 'sideeffects-false-usereffects-false', hasModuleSideEffects: false },
{
id: 'sideeffects-false-usereffects-false-unused-import',
hasModuleSideEffects: false
},
{ id: 'sideeffects-false-usereffects-false-used-import', hasModuleSideEffects: false },
{ id: 'sideeffects-false-usereffects-true', hasModuleSideEffects: false },
{ id: 'sideeffects-false-usereffects-true-unused-import', hasModuleSideEffects: false },
{ id: 'sideeffects-false-usereffects-true-used-import', hasModuleSideEffects: false },
{ id: 'sideeffects-null-usereffects-false', hasModuleSideEffects: false },
{ id: 'sideeffects-null-usereffects-false-unused-import', hasModuleSideEffects: false },
{ id: 'sideeffects-null-usereffects-false-used-import', hasModuleSideEffects: false },
{ id: 'sideeffects-null-usereffects-true', hasModuleSideEffects: true },
{ id: 'sideeffects-null-usereffects-true-unused-import', hasModuleSideEffects: true },
{ id: 'sideeffects-null-usereffects-true-used-import', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-false', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-false-unused-import', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-false-used-import', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-true', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-true-unused-import', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-true-used-import', hasModuleSideEffects: true }
]
getObject(
[...this.getModuleIds()]
.filter(id => !path.isAbsolute(id))
.map(id => [id, this.getModuleInfo(id).hasModuleSideEffects])
),
{
'sideeffects-false-usereffects-false': false,
'sideeffects-false-usereffects-false-unused-import': false,
'sideeffects-false-usereffects-false-used-import': false,
'sideeffects-false-usereffects-true': false,
'sideeffects-false-usereffects-true-unused-import': false,
'sideeffects-false-usereffects-true-used-import': false,
'sideeffects-null-usereffects-false': false,
'sideeffects-null-usereffects-false-unused-import': false,
'sideeffects-null-usereffects-false-used-import': false,
'sideeffects-null-usereffects-true': true,
'sideeffects-null-usereffects-true-unused-import': true,
'sideeffects-null-usereffects-true-used-import': true,
'sideeffects-true-usereffects-false': true,
'sideeffects-true-usereffects-false-unused-import': true,
'sideeffects-true-usereffects-false-used-import': true,
'sideeffects-true-usereffects-true': true,
'sideeffects-true-usereffects-true-unused-import': true,
'sideeffects-true-usereffects-true-used-import': true
}
);
}
}
Expand Down
54 changes: 27 additions & 27 deletions test/function/samples/deprecated/resolve-id/_config.js
View file
@@ -1,5 +1,7 @@
const assert = require('assert');
const path = require('path');
const { getObject } = require('../../../../utils');

const sideEffects = [];

module.exports = {
Expand Down Expand Up @@ -55,33 +57,31 @@ module.exports = {
},
buildEnd() {
assert.deepStrictEqual(
Array.from(this.getModuleIds())
.filter(id => !path.isAbsolute(id))
.sort()
.map(id => ({ id, hasModuleSideEffects: this.getModuleInfo(id).hasModuleSideEffects })),
[
{ id: 'sideeffects-false-usereffects-false', hasModuleSideEffects: false },
{
id: 'sideeffects-false-usereffects-false-unused-import',
hasModuleSideEffects: false
},
{ id: 'sideeffects-false-usereffects-false-used-import', hasModuleSideEffects: false },
{ id: 'sideeffects-false-usereffects-true', hasModuleSideEffects: false },
{ id: 'sideeffects-false-usereffects-true-unused-import', hasModuleSideEffects: false },
{ id: 'sideeffects-false-usereffects-true-used-import', hasModuleSideEffects: false },
{ id: 'sideeffects-null-usereffects-false', hasModuleSideEffects: false },
{ id: 'sideeffects-null-usereffects-false-unused-import', hasModuleSideEffects: false },
{ id: 'sideeffects-null-usereffects-false-used-import', hasModuleSideEffects: false },
{ id: 'sideeffects-null-usereffects-true', hasModuleSideEffects: true },
{ id: 'sideeffects-null-usereffects-true-unused-import', hasModuleSideEffects: true },
{ id: 'sideeffects-null-usereffects-true-used-import', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-false', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-false-unused-import', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-false-used-import', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-true', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-true-unused-import', hasModuleSideEffects: true },
{ id: 'sideeffects-true-usereffects-true-used-import', hasModuleSideEffects: true }
]
getObject(
[...this.getModuleIds()]
.filter(id => !path.isAbsolute(id))
.map(id => [id, this.getModuleInfo(id).hasModuleSideEffects])
),
{
'sideeffects-false-usereffects-false': false,
'sideeffects-false-usereffects-false-unused-import': false,
'sideeffects-false-usereffects-false-used-import': false,
'sideeffects-false-usereffects-true': false,
'sideeffects-false-usereffects-true-unused-import': false,
'sideeffects-false-usereffects-true-used-import': false,
'sideeffects-null-usereffects-false': false,
'sideeffects-null-usereffects-false-unused-import': false,
'sideeffects-null-usereffects-false-used-import': false,
'sideeffects-null-usereffects-true': true,
'sideeffects-null-usereffects-true-unused-import': true,
'sideeffects-null-usereffects-true-used-import': true,
'sideeffects-true-usereffects-false': true,
'sideeffects-true-usereffects-false-unused-import': true,
'sideeffects-true-usereffects-false-used-import': true,
'sideeffects-true-usereffects-true': true,
'sideeffects-true-usereffects-true-unused-import': true,
'sideeffects-true-usereffects-true-used-import': true
}
);
}
}
Expand Down

0 comments on commit 16c3b24

Please sign in to comment.