datagrok-tools 4.14.56 → 4.14.58
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/bin/commands/test-all.js +4 -3
- package/bin/commands/test.js +2 -2
- package/bin/utils/test-utils.js +11 -15
- package/package.json +1 -1
package/bin/commands/test-all.js
CHANGED
|
@@ -79,6 +79,7 @@ async function testAll(args) {
|
|
|
79
79
|
(0, _testUtils.printBrowsersResult)(result, args.verbose);
|
|
80
80
|
}
|
|
81
81
|
if (args.csv) {
|
|
82
|
+
console.log('Saving');
|
|
82
83
|
(0, _testUtils.saveCsvResults)(testsResults.map(result => result.csv), csvReportDir);
|
|
83
84
|
}
|
|
84
85
|
return !testsResults.map(test => test.failed).some(failStatus => failStatus === true);
|
|
@@ -121,9 +122,9 @@ async function runTests(browsersOrder, browserOptions) {
|
|
|
121
122
|
}
|
|
122
123
|
let resultObjects = await Promise.all(browsersPromises);
|
|
123
124
|
for (let i = 0; i < resultObjects.length; i++) {
|
|
124
|
-
resultObjects[i].csv =
|
|
125
|
-
resultObjects[i].csv =
|
|
126
|
-
resultObjects[i].csv =
|
|
125
|
+
resultObjects[i].csv = (0, _testUtils.addColumnToCsv)(resultObjects[i].csv, "browser", i);
|
|
126
|
+
resultObjects[i].csv = (0, _testUtils.addColumnToCsv)(resultObjects[i].csv, "stress_test", browserOptions.stressTest ?? false);
|
|
127
|
+
resultObjects[i].csv = (0, _testUtils.addColumnToCsv)(resultObjects[i].csv, "benchmark", browserOptions.benchmark ?? false);
|
|
127
128
|
}
|
|
128
129
|
return resultObjects;
|
|
129
130
|
}
|
package/bin/commands/test.js
CHANGED
|
@@ -140,8 +140,8 @@ async function runTesting(args) {
|
|
|
140
140
|
if (reproducedTest && !reproducedTest.failed) r = await updateResultsByReproduced(r, reproducedTest, test);
|
|
141
141
|
}
|
|
142
142
|
}
|
|
143
|
-
r.csv =
|
|
144
|
-
r.csv =
|
|
143
|
+
r.csv = (0, _testUtils.addColumnToCsv)(r.csv, 'stress_test', args['stress-test'] ?? false);
|
|
144
|
+
r.csv = (0, _testUtils.addColumnToCsv)(r.csv, 'benchmark', args.benchmark ?? false);
|
|
145
145
|
testsResults.push(r);
|
|
146
146
|
organized = testsLeft;
|
|
147
147
|
browserId++;
|
package/bin/utils/test-utils.js
CHANGED
|
@@ -37,7 +37,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
37
37
|
const fetch = require('node-fetch');
|
|
38
38
|
const grokDir = _path.default.join(_os.default.homedir(), '.grok');
|
|
39
39
|
const confPath = _path.default.join(grokDir, 'config.yaml');
|
|
40
|
-
const testCollectionTimeout =
|
|
40
|
+
const testCollectionTimeout = 600000;
|
|
41
41
|
const defaultLaunchParameters = exports.defaultLaunchParameters = {
|
|
42
42
|
args: ['--disable-dev-shm-usage', '--disable-features=site-per-process', '--window-size=1920,1080', '--js-flags=--expose-gc'],
|
|
43
43
|
ignoreHTTPSErrors: true,
|
|
@@ -539,22 +539,18 @@ class TestContext {
|
|
|
539
539
|
}
|
|
540
540
|
}
|
|
541
541
|
exports.TestContext = TestContext;
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
_papaparse.default.parse(csv, {
|
|
542
|
+
function addColumnToCsv(csv, columnName, defaultValue) {
|
|
543
|
+
const results = _papaparse.default.parse(csv, {
|
|
545
544
|
header: true,
|
|
546
|
-
skipEmptyLines: true
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
});
|
|
555
|
-
}
|
|
545
|
+
skipEmptyLines: true
|
|
546
|
+
});
|
|
547
|
+
const dataWithDefaultColumn = results.data.map(row => ({
|
|
548
|
+
...row,
|
|
549
|
+
[columnName]: defaultValue
|
|
550
|
+
}));
|
|
551
|
+
return _papaparse.default.unparse(dataWithDefaultColumn, {
|
|
552
|
+
header: true
|
|
556
553
|
});
|
|
557
|
-
return result;
|
|
558
554
|
}
|
|
559
555
|
function escapeRegex(s) {
|
|
560
556
|
return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
package/package.json
CHANGED