testplane 8.40.9 → 8.41.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/package.json +2 -1
- package/build/src/browser/cdp/selectivity/fs-cache.js +18 -6
- package/build/src/browser/cdp/selectivity/fs-cache.js.map +1 -1
- package/build/src/browser/cdp/selectivity/hash-provider.d.ts +1 -0
- package/build/src/browser/cdp/selectivity/hash-provider.js +4 -2
- package/build/src/browser/cdp/selectivity/hash-provider.js.map +1 -1
- package/build/src/browser/cdp/selectivity/hash-reader.d.ts +2 -3
- package/build/src/browser/cdp/selectivity/hash-reader.js +34 -25
- package/build/src/browser/cdp/selectivity/hash-reader.js.map +1 -1
- package/build/src/browser/cdp/selectivity/index.js +9 -3
- package/build/src/browser/cdp/selectivity/index.js.map +1 -1
- package/build/src/browser/cdp/selectivity/js-selectivity.d.ts +1 -0
- package/build/src/browser/cdp/selectivity/js-selectivity.js +18 -12
- package/build/src/browser/cdp/selectivity/js-selectivity.js.map +1 -1
- package/build/src/browser/cdp/selectivity/modes.d.ts +4 -0
- package/build/src/browser/cdp/selectivity/modes.js +11 -0
- package/build/src/browser/cdp/selectivity/modes.js.map +1 -0
- package/build/src/browser/cdp/selectivity/runner.d.ts +2 -0
- package/build/src/browser/cdp/selectivity/runner.js +28 -21
- package/build/src/browser/cdp/selectivity/runner.js.map +1 -1
- package/build/src/browser/cdp/selectivity/utils.d.ts +1 -1
- package/build/src/browser/cdp/selectivity/utils.js +1 -1
- package/build/src/browser/cdp/selectivity/utils.js.map +1 -1
- package/build/src/config/types.d.ts +16 -1
- package/build/src/config/types.js +15 -5
- package/build/src/config/types.js.map +1 -1
- package/build/src/config/utils.d.ts +2 -2
- package/build/src/config/utils.js +10 -5
- package/build/src/config/utils.js.map +1 -1
- package/build/src/testplane.js +3 -1
- package/build/src/testplane.js.map +1 -1
- package/build/src/worker/runner/index.js +6 -3
- package/build/src/worker/runner/index.js.map +1 -1
- package/package.json +2 -1
package/build/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "testplane",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.41.0",
|
|
4
4
|
"description": "Tests framework based on mocha and wdio",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"files": [
|
|
@@ -95,6 +95,7 @@
|
|
|
95
95
|
"looks-same": "10.0.1",
|
|
96
96
|
"micromatch": "4.0.5",
|
|
97
97
|
"mocha": "10.2.0",
|
|
98
|
+
"p-limit": "3.1.0",
|
|
98
99
|
"pirates": "4.0.7",
|
|
99
100
|
"plugins-loader": "1.3.4",
|
|
100
101
|
"png-validator": "1.1.0",
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.setCachedSelectivityFile = exports.getCachedSelectivityFile = exports.hasCachedSelectivityFile = exports.CacheType = void 0;
|
|
7
7
|
const node_os_1 = __importDefault(require("node:os"));
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const p_limit_1 = __importDefault(require("p-limit"));
|
|
9
10
|
const proper_lockfile_1 = __importDefault(require("proper-lockfile"));
|
|
10
11
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
11
12
|
const crypto_1 = require("../../../utils/crypto");
|
|
@@ -17,12 +18,14 @@ exports.CacheType = {
|
|
|
17
18
|
// Cache is considered fresh if it was created after process start
|
|
18
19
|
const processStartTime = Number(new Date());
|
|
19
20
|
const tmpDir = node_path_1.default.join(node_os_1.default.tmpdir(), constants_1.SELECTIVITY_CACHE_DIRECTIRY);
|
|
21
|
+
// https://nodejs.org/api/cli.html#uv_threadpool_sizesize
|
|
22
|
+
const libUVLimited = (0, p_limit_1.default)((process.env.UV_THREADPOOL_SIZE && Number(process.env.UV_THREADPOOL_SIZE)) || 16);
|
|
20
23
|
const ensureSelectivityCacheDirectory = async () => {
|
|
21
|
-
await fs_extra_1.default.ensureDir(tmpDir);
|
|
24
|
+
await libUVLimited(() => fs_extra_1.default.ensureDir(tmpDir));
|
|
22
25
|
};
|
|
23
26
|
const wasModifiedAfterProcessStart = async (flagFilePath) => {
|
|
24
27
|
try {
|
|
25
|
-
const stats = await fs_extra_1.default.stat(flagFilePath);
|
|
28
|
+
const stats = await libUVLimited(() => fs_extra_1.default.stat(flagFilePath));
|
|
26
29
|
return stats.mtimeMs >= processStartTime;
|
|
27
30
|
}
|
|
28
31
|
catch {
|
|
@@ -30,6 +33,9 @@ const wasModifiedAfterProcessStart = async (flagFilePath) => {
|
|
|
30
33
|
}
|
|
31
34
|
};
|
|
32
35
|
const hasCachedSelectivityFile = async (cacheType, key) => {
|
|
36
|
+
if (!key) {
|
|
37
|
+
throw new Error("Attepted to check existance of cache with empty key");
|
|
38
|
+
}
|
|
33
39
|
const hashName = cacheType + (0, crypto_1.getMD5)(key);
|
|
34
40
|
const cacheFilePath = node_path_1.default.join(tmpDir, hashName);
|
|
35
41
|
const flagFilePath = cacheFilePath + constants_1.SELECTIVITY_CACHE_READY_SUFFIX;
|
|
@@ -37,18 +43,21 @@ const hasCachedSelectivityFile = async (cacheType, key) => {
|
|
|
37
43
|
};
|
|
38
44
|
exports.hasCachedSelectivityFile = hasCachedSelectivityFile;
|
|
39
45
|
const getCachedSelectivityFile = async (cacheType, key) => {
|
|
46
|
+
if (!key) {
|
|
47
|
+
throw new Error("Attepted to read cache with empty key");
|
|
48
|
+
}
|
|
40
49
|
const hashName = cacheType + (0, crypto_1.getMD5)(key);
|
|
41
50
|
const cacheFilePath = node_path_1.default.join(tmpDir, hashName);
|
|
42
51
|
const flagFilePath = cacheFilePath + constants_1.SELECTIVITY_CACHE_READY_SUFFIX;
|
|
43
52
|
if (await wasModifiedAfterProcessStart(flagFilePath)) {
|
|
44
|
-
const cacheContents = await fs_extra_1.default.readFile(cacheFilePath, "utf8").catch(() => null);
|
|
53
|
+
const cacheContents = await libUVLimited(() => fs_extra_1.default.readFile(cacheFilePath, "utf8")).catch(() => null);
|
|
45
54
|
return cacheContents;
|
|
46
55
|
}
|
|
47
56
|
// Writing cache right now, should wait a little bit
|
|
48
57
|
if (await wasModifiedAfterProcessStart(cacheFilePath)) {
|
|
49
58
|
for (let i = 0; i < 10; i++) {
|
|
50
59
|
if (await wasModifiedAfterProcessStart(flagFilePath)) {
|
|
51
|
-
const cacheContents = await fs_extra_1.default.readFile(cacheFilePath, "utf8").catch(() => null);
|
|
60
|
+
const cacheContents = await libUVLimited(() => fs_extra_1.default.readFile(cacheFilePath, "utf8")).catch(() => null);
|
|
52
61
|
return cacheContents;
|
|
53
62
|
}
|
|
54
63
|
await new Promise(resolve => setTimeout(resolve, 50));
|
|
@@ -58,6 +67,9 @@ const getCachedSelectivityFile = async (cacheType, key) => {
|
|
|
58
67
|
};
|
|
59
68
|
exports.getCachedSelectivityFile = getCachedSelectivityFile;
|
|
60
69
|
const setCachedSelectivityFile = async (cacheType, key, utf8Contents) => {
|
|
70
|
+
if (!key) {
|
|
71
|
+
throw new Error("Attepted to write cache with empty key");
|
|
72
|
+
}
|
|
61
73
|
const hashName = cacheType + (0, crypto_1.getMD5)(key);
|
|
62
74
|
const cacheFilePath = node_path_1.default.join(tmpDir, hashName);
|
|
63
75
|
const flagFilePath = cacheFilePath + constants_1.SELECTIVITY_CACHE_READY_SUFFIX;
|
|
@@ -84,11 +96,11 @@ const setCachedSelectivityFile = async (cacheType, key, utf8Contents) => {
|
|
|
84
96
|
return;
|
|
85
97
|
}
|
|
86
98
|
try {
|
|
87
|
-
await fs_extra_1.default.writeFile(cacheFilePath, utf8Contents, { encoding: "utf8" }).catch(cause => {
|
|
99
|
+
await libUVLimited(() => fs_extra_1.default.writeFile(cacheFilePath, utf8Contents, { encoding: "utf8" })).catch(cause => {
|
|
88
100
|
throw new Error(`Couldn't write cache to "${cacheFilePath}"`, { cause });
|
|
89
101
|
});
|
|
90
102
|
// Using "writeFile" to trigger "mtime" update even if file exists
|
|
91
|
-
await fs_extra_1.default.writeFile(flagFilePath, "").catch(cause => {
|
|
103
|
+
await libUVLimited(() => fs_extra_1.default.writeFile(flagFilePath, "")).catch(cause => {
|
|
92
104
|
throw new Error(`Couldn't mark cache as fresh at "${cacheFilePath}"`, { cause });
|
|
93
105
|
});
|
|
94
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-cache.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/fs-cache.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,0DAA6B;AAC7B,sEAAuC;AACvC,wDAA0B;AAC1B,kDAA+C;AAC/C,2CAA0F;AAE7E,QAAA,SAAS,GAAG;IACrB,QAAQ,EAAE,GAAG;IACb,KAAK,EAAE,GAAG;CACJ,CAAC;AAIX,kEAAkE;AAClE,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AAC5C,MAAM,MAAM,GAAG,mBAAI,CAAC,IAAI,CAAC,iBAAE,CAAC,MAAM,EAAE,EAAE,uCAA2B,CAAC,CAAC;AAEnE,MAAM,+BAA+B,GAAG,KAAK,IAAmB,EAAE;IAC9D,MAAM,kBAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"fs-cache.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/fs-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export declare class HashProvider {
|
|
2
2
|
private static readonly _fileHashStore;
|
|
3
3
|
private static readonly _patternHashStore;
|
|
4
|
+
private static readonly _limited;
|
|
4
5
|
calculateForFile(filePath: string): Promise<string>;
|
|
5
6
|
calculateForPattern(pattern: string): Promise<string>;
|
|
6
7
|
}
|
|
@@ -30,6 +30,7 @@ exports.HashProvider = void 0;
|
|
|
30
30
|
const node_path_1 = __importDefault(require("node:path"));
|
|
31
31
|
const node_crypto_1 = __importDefault(require("node:crypto"));
|
|
32
32
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
33
|
+
const p_limit_1 = __importDefault(require("p-limit"));
|
|
33
34
|
const calculateFileMd5Hash = (filePath) => new Promise((resolve, reject) => {
|
|
34
35
|
const hash = node_crypto_1.default.createHash("md5");
|
|
35
36
|
const fileReadStream = node_fs_1.default.createReadStream(filePath);
|
|
@@ -43,7 +44,7 @@ class HashProvider {
|
|
|
43
44
|
if (cachedHash) {
|
|
44
45
|
return cachedHash;
|
|
45
46
|
}
|
|
46
|
-
const hashPromise = calculateFileMd5Hash(filePath);
|
|
47
|
+
const hashPromise = HashProvider._limited(() => calculateFileMd5Hash(filePath));
|
|
47
48
|
HashProvider._fileHashStore.set(filePath, hashPromise);
|
|
48
49
|
return hashPromise;
|
|
49
50
|
}
|
|
@@ -63,7 +64,7 @@ class HashProvider {
|
|
|
63
64
|
const hash = node_crypto_1.default.createHash("md5");
|
|
64
65
|
let promiseQue = Promise.resolve();
|
|
65
66
|
for (const filePath of filesSorted) {
|
|
66
|
-
const fileHashPromise = calculateFileMd5Hash(filePath);
|
|
67
|
+
const fileHashPromise = HashProvider._limited(() => calculateFileMd5Hash(filePath));
|
|
67
68
|
const cwdRelativePath = node_path_1.default.relative(cwd, filePath);
|
|
68
69
|
const posixRelativePath = node_path_1.default.sep === node_path_1.default.posix.sep
|
|
69
70
|
? cwdRelativePath
|
|
@@ -81,4 +82,5 @@ class HashProvider {
|
|
|
81
82
|
exports.HashProvider = HashProvider;
|
|
82
83
|
HashProvider._fileHashStore = new Map();
|
|
83
84
|
HashProvider._patternHashStore = new Map();
|
|
85
|
+
HashProvider._limited = (0, p_limit_1.default)(16);
|
|
84
86
|
//# sourceMappingURL=hash-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-provider.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/hash-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA6B;AAC7B,8DAAiC;AACjC,sDAAyB;
|
|
1
|
+
{"version":3,"file":"hash-provider.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/hash-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,12 @@ export declare class HashReader {
|
|
|
5
5
|
private readonly _selectivityHashesPath;
|
|
6
6
|
private readonly _compresion;
|
|
7
7
|
private _hashFileContents;
|
|
8
|
+
private _fileStateCache;
|
|
8
9
|
constructor(selectivityRootPath: string, compression: SelectivityCompressionType);
|
|
9
10
|
private _getHashFileContents;
|
|
10
|
-
private _readHashForFile;
|
|
11
|
-
private _readHashForModule;
|
|
12
|
-
private _readHashForPattern;
|
|
13
11
|
patternHasChanged(pattern: string): Promise<boolean>;
|
|
14
12
|
/** @returns changed deps or null, if nothing changed */
|
|
15
13
|
getTestChangedDeps(testDeps: NormalizedDependencies): Promise<NormalizedDependencies | null>;
|
|
14
|
+
clearCache(): void;
|
|
16
15
|
}
|
|
17
16
|
export declare const getHashReader: ((selectivityRootPath: string, compression: SelectivityCompressionType) => HashReader) & import("lodash").MemoizedFunction;
|
|
@@ -13,6 +13,7 @@ class HashReader {
|
|
|
13
13
|
constructor(selectivityRootPath, compression) {
|
|
14
14
|
this._hashProvider = new hash_provider_1.HashProvider();
|
|
15
15
|
this._hashFileContents = null;
|
|
16
|
+
this._fileStateCache = new Map();
|
|
16
17
|
this._selectivityHashesPath = (0, utils_1.getSelectivityHashesPath)(selectivityRootPath);
|
|
17
18
|
this._compresion = compression;
|
|
18
19
|
}
|
|
@@ -22,45 +23,53 @@ class HashReader {
|
|
|
22
23
|
}
|
|
23
24
|
return (this._hashFileContents = (0, utils_1.readHashFileContents)(this._selectivityHashesPath, this._compresion));
|
|
24
25
|
}
|
|
25
|
-
_readHashForFile(filePath) {
|
|
26
|
-
return this._getHashFileContents().then(hashFileContents => hashFileContents.files[filePath]);
|
|
27
|
-
}
|
|
28
|
-
_readHashForModule(moduleName) {
|
|
29
|
-
return this._getHashFileContents().then(hashFileContents => hashFileContents.modules[moduleName]);
|
|
30
|
-
}
|
|
31
|
-
_readHashForPattern(pattern) {
|
|
32
|
-
return this._getHashFileContents().then(hashFileContents => hashFileContents.patterns[pattern]);
|
|
33
|
-
}
|
|
34
26
|
async patternHasChanged(pattern) {
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
]);
|
|
27
|
+
const fileContents = await this._getHashFileContents();
|
|
28
|
+
const cachedPatternHash = fileContents.patterns[pattern];
|
|
29
|
+
const calculatedPatternHash = await this._hashProvider.calculateForPattern(pattern);
|
|
39
30
|
return cachedPatternHash !== calculatedPatternHash;
|
|
40
31
|
}
|
|
41
32
|
/** @returns changed deps or null, if nothing changed */
|
|
42
33
|
async getTestChangedDeps(testDeps) {
|
|
43
34
|
const depFileTypes = ["css", "js", "modules"];
|
|
44
|
-
const
|
|
45
|
-
let
|
|
35
|
+
const fileContents = await this._getHashFileContents();
|
|
36
|
+
let result = null;
|
|
46
37
|
const checkForDepFileType = async (depFileType) => {
|
|
47
|
-
|
|
38
|
+
for (const filePath of testDeps[depFileType]) {
|
|
39
|
+
const isChanged = this._fileStateCache.get(filePath);
|
|
40
|
+
if (isChanged === false) {
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
else if (isChanged === true) {
|
|
44
|
+
result ||= { css: [], js: [], modules: [] };
|
|
45
|
+
result[depFileType].push(filePath);
|
|
46
|
+
continue;
|
|
47
|
+
}
|
|
48
48
|
const adjustedFilePath = depFileType === "modules" ? node_path_1.default.join(filePath, "package.json") : filePath;
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
const cachedFileHash = depFileType === "modules" ? fileContents.modules[filePath] : fileContents.files[filePath];
|
|
50
|
+
const calculatedFileHash = await this._hashProvider
|
|
51
|
+
.calculateForFile(adjustedFilePath)
|
|
52
|
+
.catch((err) => err);
|
|
53
53
|
if (calculatedFileHash instanceof Error) {
|
|
54
|
-
(0, debug_1.debugSelectivity)(
|
|
54
|
+
(0, debug_1.debugSelectivity)(`${calculatedFileHash.message}: ${calculatedFileHash.cause}`);
|
|
55
55
|
}
|
|
56
56
|
if (cachedFileHash !== calculatedFileHash) {
|
|
57
|
-
|
|
57
|
+
result ||= { css: [], js: [], modules: [] };
|
|
58
58
|
result[depFileType].push(filePath);
|
|
59
|
+
this._fileStateCache.set(filePath, true);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
this._fileStateCache.set(filePath, false);
|
|
59
63
|
}
|
|
60
|
-
}
|
|
64
|
+
}
|
|
61
65
|
};
|
|
62
|
-
|
|
63
|
-
|
|
66
|
+
for (const depFileType of depFileTypes) {
|
|
67
|
+
await checkForDepFileType(depFileType);
|
|
68
|
+
}
|
|
69
|
+
return result;
|
|
70
|
+
}
|
|
71
|
+
clearCache() {
|
|
72
|
+
this._fileStateCache.clear();
|
|
64
73
|
}
|
|
65
74
|
}
|
|
66
75
|
exports.HashReader = HashReader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-reader.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/hash-reader.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAiC;AACjC,0DAA6B;AAC7B,mDAA+C;AAC/C,mCAAyE;AACzE,mCAA2C;AAG3C,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"hash-reader.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/hash-reader.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const types_1 = require("./types");
|
|
|
10
10
|
const testplane_selectivity_1 = require("./testplane-selectivity");
|
|
11
11
|
const hash_reader_1 = require("./hash-reader");
|
|
12
12
|
const events_1 = require("../../../events");
|
|
13
|
+
const modes_1 = require("./modes");
|
|
13
14
|
/**
|
|
14
15
|
* Called at the end of successfull testplane run
|
|
15
16
|
* Not using "Promise.all" here because all hashes are already calculated and cached at the start
|
|
@@ -19,7 +20,7 @@ const updateSelectivityHashes = async (config) => {
|
|
|
19
20
|
for (const browserId of browserIds) {
|
|
20
21
|
const browserConfig = config.forBrowser(browserId);
|
|
21
22
|
const { enabled, testDependenciesPath, compression, disableSelectivityPatterns } = browserConfig.selectivity;
|
|
22
|
-
if (!enabled) {
|
|
23
|
+
if (!(0, modes_1.selectivityShouldWrite)(enabled)) {
|
|
23
24
|
continue;
|
|
24
25
|
}
|
|
25
26
|
const hashReader = (0, hash_reader_1.getHashReader)(testDependenciesPath, compression);
|
|
@@ -30,13 +31,18 @@ const updateSelectivityHashes = async (config) => {
|
|
|
30
31
|
hashWriter.addPatternDependencyHash(pattern);
|
|
31
32
|
}
|
|
32
33
|
}
|
|
33
|
-
|
|
34
|
+
try {
|
|
35
|
+
await hashWriter.commit();
|
|
36
|
+
}
|
|
37
|
+
catch (cause) {
|
|
38
|
+
throw new Error("Selectivity: couldn't save test dependencies hash", { cause });
|
|
39
|
+
}
|
|
34
40
|
}
|
|
35
41
|
};
|
|
36
42
|
exports.updateSelectivityHashes = updateSelectivityHashes;
|
|
37
43
|
const startSelectivity = async (browser) => {
|
|
38
44
|
const { enabled, compression, sourceRoot, testDependenciesPath, mapDependencyRelativePath } = browser.config.selectivity;
|
|
39
|
-
if (!enabled || !browser.publicAPI.isChromium) {
|
|
45
|
+
if (!(0, modes_1.selectivityShouldWrite)(enabled) || !browser.publicAPI.isChromium) {
|
|
40
46
|
return () => Promise.resolve();
|
|
41
47
|
}
|
|
42
48
|
if (compression === types_1.Compression.ZSTD && !process.versions.zstd) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/index.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,qDAAiD;AAEjD,yEAAuE;AAEvE,mCAA+E;AAC/E,+CAA8C;AAC9C,mCAAsC;AACtC,mEAA4E;AAC5E,+CAA8C;AAE9C,4CAA+C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare class JSSelectivity {
|
|
|
8
8
|
private _debuggerOnScriptParsedFn;
|
|
9
9
|
private _scriptsSource;
|
|
10
10
|
private _scriptsSourceMap;
|
|
11
|
+
private _scriptIdToSourceUrl;
|
|
11
12
|
private _scriptIdToSourceMapUrl;
|
|
12
13
|
constructor(cdp: CDP, sessionId: CDPSessionId, sourceRoot?: string);
|
|
13
14
|
private _processScript;
|
|
@@ -17,6 +17,7 @@ class JSSelectivity {
|
|
|
17
17
|
this._debuggerOnScriptParsedFn = null;
|
|
18
18
|
this._scriptsSource = {};
|
|
19
19
|
this._scriptsSourceMap = {};
|
|
20
|
+
this._scriptIdToSourceUrl = {};
|
|
20
21
|
this._scriptIdToSourceMapUrl = {};
|
|
21
22
|
this._cdp = cdp;
|
|
22
23
|
this._sessionId = sessionId;
|
|
@@ -26,6 +27,7 @@ class JSSelectivity {
|
|
|
26
27
|
if (!this._sessionId) {
|
|
27
28
|
return;
|
|
28
29
|
}
|
|
30
|
+
this._scriptIdToSourceUrl[scriptId] ||= url;
|
|
29
31
|
if (!url || !sourceMapURL) {
|
|
30
32
|
this._scriptsSource[scriptId] ||= Promise.resolve(null);
|
|
31
33
|
this._scriptsSourceMap[scriptId] ||= Promise.resolve(null);
|
|
@@ -107,6 +109,7 @@ class JSSelectivity {
|
|
|
107
109
|
return scriptSource;
|
|
108
110
|
})
|
|
109
111
|
.catch((err) => err);
|
|
112
|
+
this._scriptIdToSourceUrl[scriptId] ||= url;
|
|
110
113
|
this._scriptsSource[scriptId] ||= scriptSourcePromise;
|
|
111
114
|
this._scriptsSourceMap[scriptId] ||= scriptSourcePromise.then(async (sourceCode) => {
|
|
112
115
|
if (sourceCode instanceof Error) {
|
|
@@ -144,19 +147,22 @@ class JSSelectivity {
|
|
|
144
147
|
const grouppedByScriptCoverage = (0, lodash_1.groupBy)(coverage.result, "scriptId");
|
|
145
148
|
const scriptIds = Object.keys(grouppedByScriptCoverage);
|
|
146
149
|
await Promise.all(scriptIds.map(async (scriptId) => {
|
|
147
|
-
// Every "scriptId" has only one uniq "url"
|
|
148
|
-
const url = grouppedByScriptCoverage[scriptId][0].url;
|
|
149
150
|
const [source, sourceMaps] = await Promise.all([
|
|
150
151
|
this._scriptsSource[scriptId],
|
|
151
152
|
this._scriptsSourceMap[scriptId],
|
|
152
153
|
]);
|
|
153
154
|
const sourceMapUrl = this._scriptIdToSourceMapUrl[scriptId];
|
|
155
|
+
// Every "scriptId" has only one uniq "url"
|
|
156
|
+
const sourceUrl = this._scriptIdToSourceUrl[scriptId] || grouppedByScriptCoverage[scriptId][0].url;
|
|
154
157
|
// Function was called, but source maps were not generated for the file
|
|
155
|
-
|
|
158
|
+
// Or its anonymous script, without source url
|
|
159
|
+
if (!source || !sourceMaps || !sourceUrl) {
|
|
156
160
|
return;
|
|
157
161
|
}
|
|
158
162
|
if (source instanceof Error) {
|
|
159
|
-
throw new Error(`JS Selectivity: Couldn't load source code from ${
|
|
163
|
+
throw new Error(`JS Selectivity: Couldn't load source code from ${sourceUrl}`, {
|
|
164
|
+
cause: source,
|
|
165
|
+
});
|
|
160
166
|
}
|
|
161
167
|
if (sourceMaps instanceof Error) {
|
|
162
168
|
throw new Error(`JS Selectivity: Couldn't load source maps from ${sourceMapUrl}`, {
|
|
@@ -166,14 +172,14 @@ class JSSelectivity {
|
|
|
166
172
|
if ((0, utils_1.isCachedOnFs)(sourceMaps) && !sourceMapUrl) {
|
|
167
173
|
throw new Error("Assertation failed: souce map url has to present if source maps are fs-cached");
|
|
168
174
|
}
|
|
169
|
-
const sourceString =
|
|
170
|
-
?
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
+
const [sourceString, sourceMapsString] = await Promise.all([
|
|
176
|
+
(0, utils_1.isCachedOnFs)(source) ? (0, fs_cache_1.getCachedSelectivityFile)(fs_cache_1.CacheType.Asset, sourceUrl) : source,
|
|
177
|
+
(0, utils_1.isCachedOnFs)(sourceMaps)
|
|
178
|
+
? (0, fs_cache_1.getCachedSelectivityFile)(fs_cache_1.CacheType.Asset, sourceMapUrl)
|
|
179
|
+
: sourceMaps,
|
|
180
|
+
]);
|
|
175
181
|
if (!sourceString || !sourceMapsString) {
|
|
176
|
-
throw new Error(`JS Selectivity: fs-cache is broken for ${
|
|
182
|
+
throw new Error(`JS Selectivity: fs-cache is broken for ${sourceUrl}`);
|
|
177
183
|
}
|
|
178
184
|
const startOffsetsSet = new Set();
|
|
179
185
|
grouppedByScriptCoverage[scriptId].forEach(entry => {
|
|
@@ -183,7 +189,7 @@ class JSSelectivity {
|
|
|
183
189
|
});
|
|
184
190
|
});
|
|
185
191
|
});
|
|
186
|
-
const dependingSourceFiles =
|
|
192
|
+
const dependingSourceFiles = (0, utils_1.extractSourceFilesDeps)(sourceString, sourceMapsString, Array.from(startOffsetsSet), this._sourceRoot);
|
|
187
193
|
for (const sourceFile of dependingSourceFiles.values()) {
|
|
188
194
|
if (isSourceCodeFile(sourceFile)) {
|
|
189
195
|
totalDependingSourceFiles.add(sourceFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"js-selectivity.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/js-selectivity.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AACjC,uCAAiD;AACjD,iEAA8E;AAC9E,mCAA6G;AAC7G,yCAAqH;AACrH,mCAA2C;AAM3C,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE9F,MAAM,gBAAgB,GAAG,CAAC,cAAsB,EAAW,EAAE;IACzD,OAAO,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"js-selectivity.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/js-selectivity.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type SelectivityModeValue } from "../../../config/types";
|
|
2
|
+
export declare const selectivityIsDisabled: (mode: SelectivityModeValue) => boolean;
|
|
3
|
+
export declare const selectivityShouldWrite: (mode: SelectivityModeValue) => boolean;
|
|
4
|
+
export declare const selectivityShouldRead: (mode: SelectivityModeValue) => boolean;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.selectivityShouldRead = exports.selectivityShouldWrite = exports.selectivityIsDisabled = void 0;
|
|
4
|
+
const types_1 = require("../../../config/types");
|
|
5
|
+
const selectivityIsDisabled = (mode) => mode === types_1.SelectivityMode.Disabled;
|
|
6
|
+
exports.selectivityIsDisabled = selectivityIsDisabled;
|
|
7
|
+
const selectivityShouldWrite = (mode) => mode === types_1.SelectivityMode.Enabled || mode === types_1.SelectivityMode.WriteOnly;
|
|
8
|
+
exports.selectivityShouldWrite = selectivityShouldWrite;
|
|
9
|
+
const selectivityShouldRead = (mode) => mode === types_1.SelectivityMode.Enabled || mode === types_1.SelectivityMode.ReadOnly;
|
|
10
|
+
exports.selectivityShouldRead = selectivityShouldRead;
|
|
11
|
+
//# sourceMappingURL=modes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modes.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/modes.ts"],"names":[],"mappings":";;;AAAA,iDAAmF;AAE5E,MAAM,qBAAqB,GAAG,CAAC,IAA0B,EAAW,EAAE,CAAC,IAAI,KAAK,uBAAe,CAAC,QAAQ,CAAC;AAAnG,QAAA,qBAAqB,yBAA8E;AACzG,MAAM,sBAAsB,GAAG,CAAC,IAA0B,EAAW,EAAE,CAC1E,IAAI,KAAK,uBAAe,CAAC,OAAO,IAAI,IAAI,KAAK,uBAAe,CAAC,SAAS,CAAC;AAD9D,QAAA,sBAAsB,0BACwC;AACpE,MAAM,qBAAqB,GAAG,CAAC,IAA0B,EAAW,EAAE,CACzE,IAAI,KAAK,uBAAe,CAAC,OAAO,IAAI,IAAI,KAAK,uBAAe,CAAC,QAAQ,CAAC;AAD7D,QAAA,qBAAqB,yBACwC"}
|
|
@@ -9,6 +9,8 @@ export declare class SelectivityRunner {
|
|
|
9
9
|
private readonly _runTestFn;
|
|
10
10
|
private readonly _opts?;
|
|
11
11
|
private readonly _browserSelectivityDisabledCache;
|
|
12
|
+
private readonly _testsToRun;
|
|
13
|
+
private readonly _processingTestLimit;
|
|
12
14
|
private readonly _processingTestPromises;
|
|
13
15
|
static create(...args: ConstructorParameters<typeof this>): SelectivityRunner;
|
|
14
16
|
constructor(mainRunner: MainRunner, config: Config, runTestFn: (test: Test, browserId: string) => void, opts?: SelectivityRunnerOptions);
|
|
@@ -5,14 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.SelectivityRunner = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
+
const p_limit_1 = __importDefault(require("p-limit"));
|
|
8
9
|
const debug_1 = require("./debug");
|
|
9
10
|
const hash_reader_1 = require("./hash-reader");
|
|
10
11
|
const events_1 = require("../../../events");
|
|
11
12
|
const hash_writer_1 = require("./hash-writer");
|
|
12
13
|
const test_dependencies_reader_1 = require("./test-dependencies-reader");
|
|
14
|
+
const modes_1 = require("./modes");
|
|
13
15
|
/** Called at the start of testplane run per each browser */
|
|
14
16
|
const shouldDisableBrowserSelectivity = lodash_1.default.memoize(async (config, browserId) => {
|
|
15
|
-
if (!config.selectivity.enabled) {
|
|
17
|
+
if (!(0, modes_1.selectivityShouldRead)(config.selectivity.enabled)) {
|
|
16
18
|
return true;
|
|
17
19
|
}
|
|
18
20
|
if (!config.selectivity.disableSelectivityPatterns.length) {
|
|
@@ -47,13 +49,13 @@ const shouldDisableBrowserSelectivity = lodash_1.default.memoize(async (config,
|
|
|
47
49
|
});
|
|
48
50
|
}, config => {
|
|
49
51
|
const { enabled, testDependenciesPath, compression, disableSelectivityPatterns } = config.selectivity;
|
|
50
|
-
return enabled
|
|
51
|
-
?
|
|
52
|
+
return (0, modes_1.selectivityShouldRead)(enabled)
|
|
53
|
+
? testDependenciesPath + "#" + compression + "#" + disableSelectivityPatterns.join("#")
|
|
52
54
|
: "";
|
|
53
55
|
});
|
|
54
56
|
const shouldDisableTestBySelectivity = lodash_1.default.memoize(async (config, test) => {
|
|
55
57
|
const { enabled, testDependenciesPath, compression } = config.selectivity;
|
|
56
|
-
if (!enabled) {
|
|
58
|
+
if (!(0, modes_1.selectivityShouldRead)(enabled)) {
|
|
57
59
|
return false;
|
|
58
60
|
}
|
|
59
61
|
const testDepsReader = (0, test_dependencies_reader_1.getTestDependenciesReader)(testDependenciesPath, compression);
|
|
@@ -73,7 +75,7 @@ const shouldDisableTestBySelectivity = lodash_1.default.memoize(async (config, t
|
|
|
73
75
|
return !changedDeps;
|
|
74
76
|
}, (config, test) => {
|
|
75
77
|
const { enabled, testDependenciesPath, compression } = config.selectivity;
|
|
76
|
-
return enabled ?
|
|
78
|
+
return (0, modes_1.selectivityShouldRead)(enabled) ? testDependenciesPath + "#" + compression + "#" + test.id : "";
|
|
77
79
|
});
|
|
78
80
|
const onTestDependencies = (context, data) => {
|
|
79
81
|
const hashWriter = (0, hash_writer_1.getHashWriter)(context.testDependenciesPath, context.compression);
|
|
@@ -85,6 +87,8 @@ class SelectivityRunner {
|
|
|
85
87
|
}
|
|
86
88
|
constructor(mainRunner, config, runTestFn, opts) {
|
|
87
89
|
this._browserSelectivityDisabledCache = {};
|
|
90
|
+
this._testsToRun = [];
|
|
91
|
+
this._processingTestLimit = (0, p_limit_1.default)(16);
|
|
88
92
|
this._processingTestPromises = [];
|
|
89
93
|
this._config = config;
|
|
90
94
|
this._runTestFn = runTestFn;
|
|
@@ -106,36 +110,39 @@ class SelectivityRunner {
|
|
|
106
110
|
}
|
|
107
111
|
startTestCheckToRun(test, browserId) {
|
|
108
112
|
const browserConfig = this._config.forBrowser(browserId);
|
|
109
|
-
const
|
|
113
|
+
const shouldSelectivelySkipTests = (0, modes_1.selectivityShouldRead)(browserConfig.selectivity.enabled);
|
|
110
114
|
// If selectivity is disabled for browser
|
|
111
|
-
|
|
112
|
-
|
|
115
|
+
// If test is disabled on its own (e.g plugin testplane/chunks) we dont waste our time calculating the deps.
|
|
116
|
+
if (!shouldSelectivelySkipTests || this._opts?.shouldDisableSelectivity || test.disabled) {
|
|
117
|
+
this._testsToRun.push([test, browserId]);
|
|
113
118
|
return;
|
|
114
119
|
}
|
|
115
|
-
this._processingTestPromises.push((async () => {
|
|
120
|
+
this._processingTestPromises.push(this._processingTestLimit(async () => {
|
|
116
121
|
const shouldDisableBrowserSelectivity = await this._shouldDisableSelectivityForBrowser(browserId);
|
|
117
122
|
if (shouldDisableBrowserSelectivity) {
|
|
118
|
-
|
|
123
|
+
this._testsToRun.push([test, browserId]);
|
|
124
|
+
return;
|
|
119
125
|
}
|
|
120
126
|
const shouldDisableTest = await shouldDisableTestBySelectivity(browserConfig, test);
|
|
121
127
|
if (!shouldDisableTest) {
|
|
122
|
-
|
|
128
|
+
this._testsToRun.push([test, browserId]);
|
|
123
129
|
}
|
|
124
|
-
|
|
125
|
-
})());
|
|
130
|
+
}));
|
|
126
131
|
}
|
|
127
132
|
async runNecessaryTests() {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
if (!testToRun) {
|
|
131
|
-
continue;
|
|
132
|
-
}
|
|
133
|
-
const [test, browserId] = testToRun;
|
|
134
|
-
// All tests need to be started synchronously
|
|
133
|
+
await Promise.all(this._processingTestPromises);
|
|
134
|
+
this._testsToRun.forEach(([test, browserId]) => {
|
|
135
135
|
this._runTestFn(test, browserId);
|
|
136
|
-
}
|
|
136
|
+
});
|
|
137
137
|
// Free used memory
|
|
138
138
|
this._processingTestPromises.length = 0;
|
|
139
|
+
this._testsToRun.length = 0;
|
|
140
|
+
shouldDisableBrowserSelectivity.cache.clear?.();
|
|
141
|
+
shouldDisableTestBySelectivity.cache.clear?.();
|
|
142
|
+
this._config.getBrowserIds().forEach(browserId => {
|
|
143
|
+
const { selectivity } = this._config.forBrowser(browserId);
|
|
144
|
+
(0, hash_reader_1.getHashReader)(selectivity.testDependenciesPath, selectivity.compression).clearCache();
|
|
145
|
+
});
|
|
139
146
|
}
|
|
140
147
|
}
|
|
141
148
|
exports.SelectivityRunner = SelectivityRunner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/runner.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export declare const patchSourceMapSources: (sourceMap: RawSourceMap, sourceRoot
|
|
|
26
26
|
* @param startOffsets Executed start offsets (v8 format)
|
|
27
27
|
* @param sourceRoot Source root
|
|
28
28
|
*/
|
|
29
|
-
export declare const extractSourceFilesDeps: (source: string, sourceMaps: string, startOffsets: number[], sourceRoot: string) =>
|
|
29
|
+
export declare const extractSourceFilesDeps: (source: string, sourceMaps: string, startOffsets: number[], sourceRoot: string) => Set<string>;
|
|
30
30
|
/**
|
|
31
31
|
* @returns True, if fileUrlLikePath has some kind of protocol ("data://", "webpack://", "turbopack://", "file://")...
|
|
32
32
|
*/
|
|
@@ -93,7 +93,7 @@ exports.patchSourceMapSources = patchSourceMapSources;
|
|
|
93
93
|
* @param startOffsets Executed start offsets (v8 format)
|
|
94
94
|
* @param sourceRoot Source root
|
|
95
95
|
*/
|
|
96
|
-
const extractSourceFilesDeps =
|
|
96
|
+
const extractSourceFilesDeps = (source, sourceMaps, startOffsets, sourceRoot) => {
|
|
97
97
|
const dependantSourceFiles = new Set();
|
|
98
98
|
const sourceMapsParsed = (0, exports.patchSourceMapSources)(JSON.parse(sourceMaps), sourceRoot);
|
|
99
99
|
const consumer = new source_map_js_1.SourceMapConsumer(sourceMapsParsed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA8C;AAC9C,iDAAqE;AACrE,4CAAoB;AACpB,gDAAwB;AACxB,6BAA0B;AAC1B,8DAAgD;AAGhD,0CAAsD;AAEtD,2CAA+C;AAC/C,6CAAuD;AAGvD;;;;;;GAMG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAC7C,GAAW,EACX,OAAmB,EACnB,SAAuB,EACR,EAAE;IACjB,MAAM,mBAAmB,GAAG,IAAI,SAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC;IAE9D,IAAI,mBAAmB,EAAE,CAAC;QACtB,4FAA4F;QAC5F,wCAAwC;QACxC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,iEAAiE;IACjE,wGAAwG;IACxG,IAAI,CAAC;QACD,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,OAAO;aACT,QAAQ,CAAS,SAAS,EAAE;YACzB,UAAU,EAAE,UAAU,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,wBAAwB;YACxE,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,IAAI;SACtB,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;AACL,CAAC,CAAC;AA1BW,QAAA,4BAA4B,gCA0BvC;AAEF,MAAM,iBAAiB,GAAG,CAAC,2BAAmC,EAAW,EAAE;IACvE,OAAO,2BAA2B,CAAC,UAAU,CAAC,4BAAgB,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF;;;;GAIG;AACI,MAAM,qBAAqB,GAAG,CAAC,SAAuB,EAAE,UAAmB,EAAgB,EAAE;IAChG,SAAS,CAAC,UAAU,GAAG,UAAU,IAAI,SAAS,CAAC,UAAU,CAAC;IAE1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,IAAI,iBAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1C,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,4BAAgB,CAAC,MAAM,CAAC,CAAC;QAC/E,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC;AAEF;;;;;;;;GAQG;AACI,MAAM,sBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -232,11 +232,26 @@ type ReadinessProbeObj = {
|
|
|
232
232
|
};
|
|
233
233
|
type ReadinessProbe = ReadinessProbeFn | ReadinessProbeObj;
|
|
234
234
|
export declare enum TimeTravelMode {
|
|
235
|
+
/** @description Record and save all test runs */
|
|
235
236
|
On = "on",
|
|
237
|
+
/** @description Do not record any test runs */
|
|
236
238
|
Off = "off",
|
|
239
|
+
/** @description Record and save all retries */
|
|
237
240
|
RetriesOnly = "retries-only",
|
|
241
|
+
/** @description Record all test runs, but save only last failed run */
|
|
238
242
|
LastFailedRun = "last-failed-run"
|
|
239
243
|
}
|
|
244
|
+
export declare const SelectivityMode: {
|
|
245
|
+
/** @description Completely disables Testplane selectivity */
|
|
246
|
+
readonly Disabled: false;
|
|
247
|
+
/** @description Skips running unchanged tests, does not update selectivity state after successful run */
|
|
248
|
+
readonly ReadOnly: "read-only";
|
|
249
|
+
/** @description Runs unchanged tests, updates selectivity state after successful run */
|
|
250
|
+
readonly WriteOnly: "write-only";
|
|
251
|
+
/** @description Skips running unchanged tests, updates selectivity state after successful run */
|
|
252
|
+
readonly Enabled: true;
|
|
253
|
+
};
|
|
254
|
+
export type SelectivityModeValue = (typeof SelectivityMode)[keyof typeof SelectivityMode];
|
|
240
255
|
export interface TimeTravelConfig {
|
|
241
256
|
mode: TimeTravelMode;
|
|
242
257
|
}
|
|
@@ -344,7 +359,7 @@ export interface CommonConfig {
|
|
|
344
359
|
reuseExisting: boolean;
|
|
345
360
|
};
|
|
346
361
|
selectivity: {
|
|
347
|
-
enabled:
|
|
362
|
+
enabled: SelectivityModeValue;
|
|
348
363
|
sourceRoot: string;
|
|
349
364
|
testDependenciesPath: string;
|
|
350
365
|
compression: SelectivityCompressionType;
|
|
@@ -1,15 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TimeTravelMode = void 0;
|
|
3
|
+
exports.SelectivityMode = exports.TimeTravelMode = void 0;
|
|
4
4
|
var TimeTravelMode;
|
|
5
5
|
(function (TimeTravelMode) {
|
|
6
|
-
|
|
6
|
+
/** @description Record and save all test runs */
|
|
7
7
|
TimeTravelMode["On"] = "on";
|
|
8
|
-
|
|
8
|
+
/** @description Do not record any test runs */
|
|
9
9
|
TimeTravelMode["Off"] = "off";
|
|
10
|
-
|
|
10
|
+
/** @description Record and save all retries */
|
|
11
11
|
TimeTravelMode["RetriesOnly"] = "retries-only";
|
|
12
|
-
|
|
12
|
+
/** @description Record all test runs, but save only last failed run */
|
|
13
13
|
TimeTravelMode["LastFailedRun"] = "last-failed-run";
|
|
14
14
|
})(TimeTravelMode || (exports.TimeTravelMode = TimeTravelMode = {}));
|
|
15
|
+
exports.SelectivityMode = {
|
|
16
|
+
/** @description Completely disables Testplane selectivity */
|
|
17
|
+
Disabled: false,
|
|
18
|
+
/** @description Skips running unchanged tests, does not update selectivity state after successful run */
|
|
19
|
+
ReadOnly: "read-only",
|
|
20
|
+
/** @description Runs unchanged tests, updates selectivity state after successful run */
|
|
21
|
+
WriteOnly: "write-only",
|
|
22
|
+
/** @description Skips running unchanged tests, updates selectivity state after successful run */
|
|
23
|
+
Enabled: true,
|
|
24
|
+
};
|
|
15
25
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/config/types.ts"],"names":[],"mappings":";;;AA6QA,IAAY,cASX;AATD,WAAY,cAAc;IACtB,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/config/types.ts"],"names":[],"mappings":";;;AA6QA,IAAY,cASX;AATD,WAAY,cAAc;IACtB,iDAAiD;IACjD,2BAAS,CAAA;IACT,+CAA+C;IAC/C,6BAAW,CAAA;IACX,+CAA+C;IAC/C,8CAA4B,CAAA;IAC5B,wEAAwE;IACxE,mDAAiC,CAAA;AACrC,CAAC,EATW,cAAc,8BAAd,cAAc,QASzB;AAEY,QAAA,eAAe,GAAG;IAC3B,6DAA6D;IAC7D,QAAQ,EAAE,KAAK;IACf,yGAAyG;IACzG,QAAQ,EAAE,WAAW;IACrB,wFAAwF;IACxF,SAAS,EAAE,YAAY;IACvB,iGAAiG;IACjG,OAAO,EAAE,IAAI;CACP,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ConfigParsed } from "./types";
|
|
1
|
+
import { ConfigParsed, SelectivityModeValue } from "./types";
|
|
2
2
|
type ValueType = "string" | "number" | "boolean" | "object" | "undefined" | "function";
|
|
3
3
|
export declare const is: (type: ValueType, name: string) => (value: unknown) => void;
|
|
4
4
|
export declare const assertNonNegativeNumber: (value: number, name: string) => void;
|
|
@@ -12,6 +12,6 @@ export declare const parseBoolean: (value: string, name: string) => boolean;
|
|
|
12
12
|
export declare const parsePrimitive: <T = unknown>(str: string) => T;
|
|
13
13
|
export declare const addUserAgentToArgs: (config: ConfigParsed) => ConfigParsed;
|
|
14
14
|
export declare const extractSelectivityEnabledEnvVariable: (envPrefixes?: string[]) => {
|
|
15
|
-
enabled?:
|
|
15
|
+
enabled?: SelectivityModeValue;
|
|
16
16
|
};
|
|
17
17
|
export {};
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.extractSelectivityEnabledEnvVariable = exports.addUserAgentToArgs = exports.parsePrimitive = exports.parseBoolean = exports.assertPositiveIntegerOrInfinity = exports.assertPositiveInteger = exports.assertEnum = exports.assertNonNegativeInteger = exports.assertOptionalArray = exports.assertOptionalObject = exports.assertNonNegativeNumber = exports.is = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
+
const types_1 = require("./types");
|
|
8
9
|
const is = (type, name) => {
|
|
9
10
|
return (value) => {
|
|
10
11
|
if (typeof value !== type) {
|
|
@@ -101,11 +102,15 @@ exports.addUserAgentToArgs = addUserAgentToArgs;
|
|
|
101
102
|
const extractSelectivityEnabledEnvVariable = (envPrefixes = []) => {
|
|
102
103
|
for (const envPrefix of envPrefixes) {
|
|
103
104
|
const envName = envPrefix + "selectivity_enabled";
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
105
|
+
switch (process.env[envName]) {
|
|
106
|
+
case String(types_1.SelectivityMode.Enabled):
|
|
107
|
+
return { enabled: types_1.SelectivityMode.Enabled };
|
|
108
|
+
case String(types_1.SelectivityMode.Disabled):
|
|
109
|
+
return { enabled: types_1.SelectivityMode.Disabled };
|
|
110
|
+
case String(types_1.SelectivityMode.ReadOnly):
|
|
111
|
+
return { enabled: types_1.SelectivityMode.ReadOnly };
|
|
112
|
+
case String(types_1.SelectivityMode.WriteOnly):
|
|
113
|
+
return { enabled: types_1.SelectivityMode.WriteOnly };
|
|
109
114
|
}
|
|
110
115
|
}
|
|
111
116
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/config/utils.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/config/utils.ts"],"names":[],"mappings":"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"}
|
package/build/src/testplane.js
CHANGED
|
@@ -122,7 +122,9 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
122
122
|
const shouldDisableSelectivity = Boolean(hasTestFilter);
|
|
123
123
|
await runner.run(await this._readTests(testPaths, { browsers, sets, grep, tag, replMode, keepBrowserMode }), stats_1.Stats.create(this), { shouldDisableSelectivity });
|
|
124
124
|
if (!shouldDisableSelectivity && !this.isFailed()) {
|
|
125
|
-
await (0, selectivity_1.updateSelectivityHashes)(this.config)
|
|
125
|
+
await (0, selectivity_1.updateSelectivityHashes)(this.config).catch(err => {
|
|
126
|
+
console.error("Skipping selectivity state update because of an error:", err);
|
|
127
|
+
});
|
|
126
128
|
}
|
|
127
129
|
if (this.config.afterAll) {
|
|
128
130
|
await this.config.afterAll.call({ config: this.config }, { config: this.config });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testplane.js","sourceRoot":"","sources":["../../src/testplane.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"testplane.js","sourceRoot":"","sources":["../../src/testplane.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAAuB;AACvB,wDAA0B;AAC1B,mCAA+C;AAC/C,qDAAiD;AAEjD,6EAAoD;AACpD,qCAA6E;AAC7E,2DAAyC;AACzC,sEAA6C;AAC7C,+CAA2C;AAC3C,uDAAmD;AACnD,6CAAuD;AACvD,2CAA4C;AAC5C,uDAAyC;AACzC,2CAAkD;AAClD,6CAA6C;AAG7C,yDAA2D;AAC3D,2DAAoE;AAEpE,6DAA8D;AAC9D,+DAAwF;AACxF,0DAA+F;AAC/F,kFAA6E;AAwD7E,MAAa,SAAU,SAAQ,8BAAa;IASxC,YAAY,MAA6B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QAEzB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,SAAS,CAAC,MAAe;QACrB,IAAI,CAAC,IAAI,CAAC,qBAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,eAAe,CAAC,IAAY;QACxB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAES,KAAK,CAAC,KAAK;QACjB,MAAM,IAAA,0BAAa,EAAC;YAChB,SAAS,EAAE,IAAI;YACf,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACvC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;SACtC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC;gBACD,IAAI,CAAC,UAAU,GAAG,mBAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAClD,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAClC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,gCAAiC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9E,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAG,CACL,SAAoC,EACpC,EACI,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,UAAU,EACV,cAAc,EACd,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,eAAe,EACf,SAAS,GAAG,EAAE,MACI,EAAE;QAExB,IAAA,oCAAuB,EAAC,QAAS,EAAE,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAElE,wBAAa,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;YAC/B,UAAU;YACV,cAAc;YACd,WAAW;YACX,QAAQ;YACR,QAAQ;YACR,KAAK;YACL,eAAe;SAClB,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,kDAAO,UAAU,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAErE,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,EAAE,CAAC,qBAAY,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE;YAClC,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,qBAAY,CAAC,KAAK,EAAE,CAAC,GAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAEjF,IAAI,CAAC,EAAE,CAAC,qBAAY,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAEvE,IAAI,CAAC,EAAE,CAAC,qBAAY,CAAC,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAE/D,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,IAAA,yBAAa,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAErC,eAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,gBAAC,CAAC,MAAM,CAAC,yBAAgB,CAAC,CAAC,CAAC;QAC5E,eAAW,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,gBAAC,CAAC,MAAM,CAAC,0BAAiB,CAAC,CAAC,CAAC;QAClF,eAAW,CAAC,qBAAqB,CAAC,wBAAa,EAAE,IAAI,EAAE,qBAAY,CAAC,IAAI,CAAC,CAAC;QAE1E,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QAEnB,MAAM,CAAC,IAAI,EAAE,CAAC;QAEd,IAAA,kCAAkB,GAAE,CAAC;QAErB,IAAA,6CAAuB,GAAE,CAAC;QAE1B,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACvF,CAAC;QAED,MAAM,kBAAkB,GAAG,gBAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACnF,MAAM,aAAa,GAAG,kBAAkB,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;QACnG,MAAM,wBAAwB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QAExD,MAAM,MAAM,CAAC,GAAG,CACZ,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,EAC1F,aAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EACxB,EAAE,wBAAwB,EAAE,CAC/B,CAAC;QAEF,IAAI,CAAC,wBAAwB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAChD,MAAM,IAAA,qCAAuB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACnD,OAAO,CAAC,KAAK,CAAC,wDAAwD,EAAE,GAAG,CAAC,CAAC;YACjF,CAAC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,GAAG,IAAA,4CAAsB,GAAE,CAAC,CAAC,CAAC,CAAC;QAE1F,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAES,KAAK,CAAC,WAAW;QACvB,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,wDAAwD;IAClI,CAAC;IAES,KAAK,CAAC,UAAU,CACtB,SAAoC,EACpC,IAA4B;QAE5B,OAAO,SAAS,YAAY,gCAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnG,CAAC;IAED,YAAY,CAAC,IAAU,EAAE,SAAiB;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,SAAS,CACX,SAAmB,EACnB,EACI,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,MAAM,EACN,MAAM,EACN,QAAQ,EACR,eAAe,EACf,YAAY,MACY,EAAE;QAE9B,MAAM,UAAU,GAAG,wBAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YAEnB,eAAW,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,EAAE;gBAC3C,qBAAY,CAAC,gBAAgB;gBAC7B,qBAAY,CAAC,eAAe;aAC/B,CAAC,CAAC;QACP,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC;YAChC,KAAK,EAAE,SAAS;YAChB,QAAQ;YACR,MAAM;YACN,IAAI;YACJ,IAAI;YACJ,GAAG;YACH,QAAQ;YACR,eAAe;YACf,YAAY;SACf,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,gCAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEhD,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACnC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,CAAC;gBAChD,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1E,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,IAAI,CAAC,IAAI,CAAC,qBAAY,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAES,KAAK;QACX,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAES,cAAc,CAAC,MAAkB;QACvC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACjB,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE;YAC7B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,cAAc,EAAE,MAAM,CAAC,cAAc;SACxC,CAAC,CAAC;IACP,CAAC;IAED,QAAQ;QACJ,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,YAAY,CAAC,GAAuB;QACxC,IAAI,GAAG,IAAI,GAAG,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;YACjD,MAAM,aAAa,GAAG,IAAA,mCAAmB,EAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YACnE,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAE3C,MAAM,8BAA8B,GAAG,IAAI,mDAAuB,CAAC;gBAC/D,SAAS,EAAE,IAAA,kCAAkB,EAAC,aAAa,CAAC;gBAC5C,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,KAAK,EAAE,GAAG;aACb,CAAC,CAAC;YACH,MAAM,8BAA8B,GAAG,IAAI,mDAAuB,CAAC;gBAC/D,SAAS,EAAE,IAAA,kCAAkB,EAAC,QAAQ,CAAC;gBACvC,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,KAAK,EAAE,GAAG;aACb,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,qBAAY,CAAC,UAAU,EAAE,GAAG,EAAE;gBACpC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBAClE,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,8BAA8B,CAAC,CAAC;YACnF,CAAC,CAAC,CAAC;YAEH,iHAAiH;YACjH,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACL,CAAC;IAED,IAAI,CAAC,GAAU,EAAE,OAAO,GAAG,KAAK,EAAE,QAAQ,GAAG,IAAI;QAC7C,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACd,UAAU,CAAC,GAAG,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBACpC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;IACL,CAAC;CACJ;AA9RD,8BA8RC"}
|
|
@@ -32,6 +32,7 @@ const { isRunInNodeJsEnv } = require("../../utils/config");
|
|
|
32
32
|
const { runWithTestplaneDependenciesCollecting, readTestFileWithTestplaneDependenciesCollecting, } = require("../../browser/cdp/selectivity/testplane-selectivity");
|
|
33
33
|
const ipc = require("../../utils/ipc");
|
|
34
34
|
const { TEST_ASSIGNED_TO_WORKER } = require("../../constants/process-messages");
|
|
35
|
+
const { selectivityShouldWrite } = require("../../browser/cdp/selectivity/modes");
|
|
35
36
|
module.exports = class Runner extends AsyncEmitter {
|
|
36
37
|
static create(config) {
|
|
37
38
|
return new Runner(config);
|
|
@@ -66,18 +67,20 @@ module.exports = class Runner extends AsyncEmitter {
|
|
|
66
67
|
browserAgent,
|
|
67
68
|
attempt,
|
|
68
69
|
});
|
|
69
|
-
const
|
|
70
|
+
const shouldRecordSelectivityDeps = config.selectivity && selectivityShouldWrite(config.selectivity.enabled) && isRunInNodeJsEnv(this._config);
|
|
70
71
|
const prepareParseAndRun = async () => {
|
|
71
72
|
runner.prepareBrowser({ sessionId, sessionCaps, sessionOpts, state });
|
|
72
73
|
const readTestsFn = () => this._testParser.parse({ file, browserId });
|
|
73
|
-
const tests =
|
|
74
|
+
const tests = shouldRecordSelectivityDeps
|
|
74
75
|
? await readTestFileWithTestplaneDependenciesCollecting(file, readTestsFn)
|
|
75
76
|
: await readTestsFn();
|
|
76
77
|
const test = tests.find(t => t.fullTitle() === fullTitle);
|
|
77
78
|
runner.assignTest(test);
|
|
78
79
|
return runner.run();
|
|
79
80
|
};
|
|
80
|
-
return
|
|
81
|
+
return shouldRecordSelectivityDeps
|
|
82
|
+
? runWithTestplaneDependenciesCollecting(prepareParseAndRun)
|
|
83
|
+
: prepareParseAndRun();
|
|
81
84
|
}
|
|
82
85
|
};
|
|
83
86
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/worker/runner/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAEb,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAC/D,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC3D,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACjD,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC9C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACpD,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAC/D,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC3D,MAAM,EACF,sCAAsC,EACtC,+CAA+C,GAClD,GAAG,OAAO,CAAC,qDAAqD,CAAC,CAAC;AACnE,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACvC,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/worker/runner/index.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "testplane",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.41.0",
|
|
4
4
|
"description": "Tests framework based on mocha and wdio",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"files": [
|
|
@@ -95,6 +95,7 @@
|
|
|
95
95
|
"looks-same": "10.0.1",
|
|
96
96
|
"micromatch": "4.0.5",
|
|
97
97
|
"mocha": "10.2.0",
|
|
98
|
+
"p-limit": "3.1.0",
|
|
98
99
|
"pirates": "4.0.7",
|
|
99
100
|
"plugins-loader": "1.3.4",
|
|
100
101
|
"png-validator": "1.1.0",
|