mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-21 20:49:10 +01:00
Code Issues Releases Activity

SERVER-73541 Use dynamic import when loading parallel tester tests

Browse Source
This commit is contained in:
Matt Broadstone 2023-02-03 13:59:23 +00:00 committed by Evergreen Agent
parent 64cdb91c0f
commit ee66aa703f
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintrc.yml
View File

@ -1,9 +1,9 @@
env:
es2020: true
es2022: true
mongo: true
parserOptions:
ecmaVersion: 2020
ecmaVersion: 2022
sourceType: "module"
rules:

22
jstests/libs/parallelTester.js
View File

@ -124,8 +124,8 @@ if (typeof _threadInject != "undefined") {
this.params.push(args);
};
ParallelTester.prototype.run = function(msg) {
assert.parallelTests(this.params, msg);
ParallelTester.prototype.run = async function(msg) {
await assert.parallelTests(this.params, msg);
};
// creates lists of tests from jstests dir in a format suitable for use by
@ -359,22 +359,28 @@ if (typeof _threadInject != "undefined") {
return params;
};
async function measureAsync(fn) {
const start = new Date();
await fn.apply(null, Array.from(arguments).slice(2));
return (new Date()).getTime() - start.getTime();
}
// runs a set of test files
// first argument is an identifier for this tester, remaining arguments are file names
ParallelTester.fileTester = function() {
ParallelTester.fileTester = async function() {
var args = Array.from(arguments);
var suite = args.shift();
args.forEach(function(x) {
for (const x of args) {
print(" S" + suite + " Test : " + x + " ...");
var time = Date.timeFunc(function() {
const time = await measureAsync(async function() {
// Create a new connection to the db for each file. If tests share the same
// connection it can create difficult to debug issues.
db = new Mongo(db.getMongo().host).getDB(db.getName());
gc();
load(x);
}, 1);
print(" S" + suite + " Test : " + x + " " + time + "ms");
await import(x);
});
print(" S" + suite + " Test : " + x + " " + time + "ms");
}
};
// params: array of arrays, each element of which consists of a function followed

4
jstests/parallel/basic.js
View File

@ -6,12 +6,12 @@ Random.setRandomSeed();
var params = ParallelTester.createJstestsLists(4);
var t = new ParallelTester();
for (i in params) {
for (let i in params) {
t.add(ParallelTester.fileTester, params[i]);
}
try {
t.run("one or more tests failed");
await t.run("one or more tests failed");
} finally {
print(
"If the failure here is due to a test unexpected being run, " +

4
jstests/parallel/basicPlus.js
View File

@ -8,7 +8,7 @@ Random.setRandomSeed();
var params = ParallelTester.createJstestsLists(4);
var t = new ParallelTester();
for (i in params) {
for (let i in params) {
t.add(ParallelTester.fileTester, params[i]);
}
@ -28,7 +28,7 @@ for (var i = 4; i < 8; ++i) {
t.add(EventGenerator.dispatch, g.getEvents());
}
try {
t.run("one or more tests failed");
await t.run("one or more tests failed");
} finally {
print(
"If the failure here is due to a test unexpected being run, " +