diff options
author | Huayu Ouyang <huayu.ouyang@mongodb.com> | 2021-06-22 01:05:02 +0000 |
---|---|---|
committer | Huayu Ouyang <huayu.ouyang@mongodb.com> | 2021-06-22 14:23:03 +0000 |
commit | aa5c9ed6ac4f319a9891cfb3581f76dda8cf137a (patch) | |
tree | eb44e2534533810177b4b4ea3b392a8006e4e2c4 /jstests | |
parent | 24a6f7e76edb656a009460051e031cf363394c1a (diff) | |
download | mongo-aa5c9ed6ac4f319a9891cfb3581f76dda8cf137a.tar.gz |
SERVER-57627 Change upgrade/downgrade CWWC and CWRC warning tests to match on log message as well as log ID
Diffstat (limited to 'jstests')
-rw-r--r-- | jstests/multiVersion/upgrade_downgrade_sharded_cluster_warning_when_no_cwrc_set.js | 12 | ||||
-rw-r--r-- | jstests/multiVersion/upgrade_downgrade_warning_when_no_cwwc_set.js | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/jstests/multiVersion/upgrade_downgrade_sharded_cluster_warning_when_no_cwrc_set.js b/jstests/multiVersion/upgrade_downgrade_sharded_cluster_warning_when_no_cwrc_set.js index 273ec44b59c..4e7bff52c59 100644 --- a/jstests/multiVersion/upgrade_downgrade_sharded_cluster_warning_when_no_cwrc_set.js +++ b/jstests/multiVersion/upgrade_downgrade_sharded_cluster_warning_when_no_cwrc_set.js @@ -33,13 +33,13 @@ function testShardingUpgrade(setCWWC) { st.upgradeCluster('latest'); if (setCWWC) { assert( - rawMongoProgramOutput().search('5686202') == -1, + rawMongoProgramOutput().search(/5686202.*The default read concern/) == -1, 'Sharded cluster should not have warning when upgrading to 5.0 if cluster-wide read' + ' concern is set'); } else { assert.soon( - () => rawMongoProgramOutput().match('5686202'), + () => rawMongoProgramOutput().match('5686202.*The default read concern'), 'Sharded cluster should have warning when upgrading to 5.0 if no cluster-wide read' + ' concern is set', ReplSetTest.kDefaultTimeoutMS); @@ -49,12 +49,12 @@ function testShardingUpgrade(setCWWC) { assert.commandWorked(st.s.adminCommand({setFeatureCompatibilityVersion: latestFCV})); if (setCWWC) { assert( - rawMongoProgramOutput().search('5686200') == -1, + rawMongoProgramOutput().search(/5686200.*The default read concern/) == -1, 'Sharded cluster should not have warning when upgrading FCV to 5.0 if cluster-wide ' + 'read concern is set'); } else { assert.soon( - () => rawMongoProgramOutput().match('5686200'), + () => rawMongoProgramOutput().match('5686200.*The default read concern'), 'Sharded cluster should have warning when upgrading FCV to 5.0 if no cluster-wide ' + 'read concern is set', ReplSetTest.kDefaultTimeoutMS); @@ -79,11 +79,11 @@ function testShardingDowngrade(setCWWC) { assert.commandWorked(st.s.adminCommand({setFeatureCompatibilityVersion: lastLTSFCV})); if (setCWWC) { - assert(rawMongoProgramOutput().search('5686201') == -1, + assert(rawMongoProgramOutput().search(/5686201.*The default read concern/) == -1, 'Sharded cluster should not have warning when downgrading FCV from 5.0 if ' + 'cluster-wide read concern is set'); } else { - assert.soon(() => rawMongoProgramOutput().match('5686201'), + assert.soon(() => rawMongoProgramOutput().match('5686201.*The default read concern'), 'Sharded cluster should have warning when downgrading FCV from 5.0 if no ' + 'cluster-wide read concern is set', ReplSetTest.kDefaultTimeoutMS); diff --git a/jstests/multiVersion/upgrade_downgrade_warning_when_no_cwwc_set.js b/jstests/multiVersion/upgrade_downgrade_warning_when_no_cwwc_set.js index 755de84daa8..c70b2120c1f 100644 --- a/jstests/multiVersion/upgrade_downgrade_warning_when_no_cwwc_set.js +++ b/jstests/multiVersion/upgrade_downgrade_warning_when_no_cwwc_set.js @@ -22,13 +22,13 @@ function testReplSetUpgrade(setCWWC) { jsTestLog("Upgrading replica set to 5.0"); replTest.upgradeSet({binVersion: "latest"}); if (setCWWC) { - assert(rawMongoProgramOutput().search('5569202') == -1, + assert(rawMongoProgramOutput().search(/5569202.*The default write concern/) == -1, 'Replica set should not have warning when upgrading to 5.0 if cluster-wide write ' + 'concern is set'); } else { assert.soon( - () => rawMongoProgramOutput().match('5569202'), + () => rawMongoProgramOutput().match('5569202.*The default write concern'), 'Replica set should have warning when upgrading to 5.0 if no cluster-wide write ' + 'concern is set', ReplSetTest.kDefaultTimeoutMS); @@ -39,12 +39,12 @@ function testReplSetUpgrade(setCWWC) { assert.commandWorked(primary.adminCommand({setFeatureCompatibilityVersion: latestFCV})); if (setCWWC) { assert( - rawMongoProgramOutput().search('5569200') == -1, + rawMongoProgramOutput().search(/5569200.*The default write concern/) == -1, 'Replica set should not have warning when upgrading FCV to 5.0 if cluster-wide write' + ' concern is set'); } else { assert.soon( - () => rawMongoProgramOutput().match('5569200'), + () => rawMongoProgramOutput().match('5569200.*The default write concern'), 'Replica set should have warning when upgrading FCV to 5.0 if no cluster-wide write' + ' concern is set', ReplSetTest.kDefaultTimeoutMS); @@ -67,12 +67,12 @@ function testReplSetDowngrade(setCWWC) { jsTestLog("Downgrading FCV from 5.0"); assert.commandWorked(primary.adminCommand({setFeatureCompatibilityVersion: lastLTSFCV})); if (setCWWC) { - assert(rawMongoProgramOutput().search('5569201') == -1, + assert(rawMongoProgramOutput().search(/5569201.*The default write concern/) == -1, 'Replica set should not have warning when downgrading FCV from 5.0 if cluster-wide' + ' write concern is set'); } else { assert.soon( - () => rawMongoProgramOutput().match('5569201'), + () => rawMongoProgramOutput().match('5569201.*The default write concern'), 'Replica set should have warning when downgrading FCV from 5.0 if no cluster-wide' + ' write concern is set', ReplSetTest.kDefaultTimeoutMS); @@ -108,13 +108,13 @@ function testShardingUpgrade(setCWWC) { st.upgradeCluster('latest'); if (setCWWC) { assert( - rawMongoProgramOutput().search('5569202') == -1, + rawMongoProgramOutput().search(/5569202.*The default write concern/) == -1, 'Sharded cluster should not have warning when upgrading to 5.0 if cluster-wide write' + ' concern is set'); } else { assert.soon( - () => rawMongoProgramOutput().match('5569202'), + () => rawMongoProgramOutput().match('5569202.*The default write concern'), 'Sharded cluster should have warning when upgrading to 5.0 if no cluster-wide write' + ' concern is set', ReplSetTest.kDefaultTimeoutMS); @@ -124,12 +124,12 @@ function testShardingUpgrade(setCWWC) { assert.commandWorked(st.s.adminCommand({setFeatureCompatibilityVersion: latestFCV})); if (setCWWC) { assert( - rawMongoProgramOutput().search('5569200') == -1, + rawMongoProgramOutput().search(/5569200.*The default write concern/) == -1, 'Sharded cluster should not have warning when upgrading FCV to 5.0 if cluster-wide ' + 'write concern is set'); } else { assert.soon( - () => rawMongoProgramOutput().match('5569200'), + () => rawMongoProgramOutput().match('5569200.*The default write concern'), 'Sharded cluster should have warning when upgrading FCV to 5.0 if no cluster-wide ' + 'write concern is set', ReplSetTest.kDefaultTimeoutMS); @@ -154,11 +154,11 @@ function testShardingDowngrade(setCWWC) { assert.commandWorked(st.s.adminCommand({setFeatureCompatibilityVersion: lastLTSFCV})); if (setCWWC) { - assert(rawMongoProgramOutput().search('5569201') == -1, + assert(rawMongoProgramOutput().search(/5569201.*The default write concern/) == -1, 'Sharded cluster should not have warning when downgrading FCV from 5.0 if ' + 'cluster-wide write concern is set'); } else { - assert.soon(() => rawMongoProgramOutput().match('5569201'), + assert.soon(() => rawMongoProgramOutput().match('5569201.*The default write concern'), 'Sharded cluster should have warning when downgrading FCV from 5.0 if no ' + 'cluster-wide write concern is set', ReplSetTest.kDefaultTimeoutMS); |