diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2020-02-24 00:27:06 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-24 05:39:45 +0000 |
| commit | 63d946bd421a22500afc46d1989254b025e1cf79 (patch) | |
| tree | 9c081e2322c4e01118b6262f5883bc8c6039c3a3 | |
| parent | e433f91f86eb909d8de849798e1fdbd4c98147a5 (diff) | |
| download | mongo-63d946bd421a22500afc46d1989254b025e1cf79.tar.gz | |
SERVER-46235 Re-enable multiversion tests
3 files changed, 1 insertions, 7 deletions
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml index 1627db46df1..88efab7d5a2 100644 --- a/buildscripts/resmokeconfig/suites/multiversion.yml +++ b/buildscripts/resmokeconfig/suites/multiversion.yml @@ -18,9 +18,6 @@ selector: # it attempts to connect to an upgraded mongoD. Un-blacklist when SERVER-42919 fixes this issue. - jstests/multiVersion/genericSetFCVUsage/crash_mongos_against_upgraded_cluster.js - # Disable incompatible with json logging per SERVER-46235 - - jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js - # Multiversion tests start their own mongod's. executor: config: diff --git a/buildscripts/resmokeconfig/suites/multiversion_auth.yml b/buildscripts/resmokeconfig/suites/multiversion_auth.yml index d419492e07b..df662863282 100644 --- a/buildscripts/resmokeconfig/suites/multiversion_auth.yml +++ b/buildscripts/resmokeconfig/suites/multiversion_auth.yml @@ -23,9 +23,6 @@ selector: # it attempts to connect to an upgraded mongoD. Un-blacklist when SERVER-42919 fixes this issue. - jstests/multiVersion/genericSetFCVUsage/crash_mongos_against_upgraded_cluster.js - # Disable incompatible with json logging per SERVER-46235 - - jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js - # Multiversion tests start their own mongod's. executor: config: diff --git a/jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js b/jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js index 7d40fb7ad38..b7bcf47541a 100644 --- a/jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js +++ b/jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js @@ -37,7 +37,7 @@ for (let versions of [{from: lastStableFCV, to: latestFCV}, {from: latestFCV, to }, primary.port); assert.soon(function() { - return rawMongoProgramOutput().match("createCollection: test.mycoll"); + return rawMongoProgramOutput().match(/createCollection.*test.mycoll/); }); awaitUpgradeFCV = startParallelShell( |