SERVER-57627 Fix upgrade/downgrade CWWC and CWRC warning tests

2 files changed, 41 insertions, 27 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 339f0367562..273ec44b59c 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
@@ -38,9 +38,11 @@ function testShardingUpgrade(setCWWC) {
                 ' concern is set');
 
     } else {
-        assert(rawMongoProgramOutput().match('5686202'),
-               'Sharded cluster should have warning when upgrading to 5.0 if no cluster-wide read' +
-                   ' concern is set');
+        assert.soon(
+            () => rawMongoProgramOutput().match('5686202'),
+            'Sharded cluster should have warning when upgrading to 5.0 if no cluster-wide read' +
+                ' concern is set',
+            ReplSetTest.kDefaultTimeoutMS);
     }
 
     jsTestLog("Setting FCV to 5.0");
@@ -51,9 +53,11 @@ function testShardingUpgrade(setCWWC) {
             'Sharded cluster should not have warning when upgrading FCV to 5.0 if cluster-wide ' +
                 'read concern is set');
     } else {
-        assert(rawMongoProgramOutput().match('5686200'),
-               'Sharded cluster should have warning when upgrading FCV to 5.0 if no cluster-wide ' +
-                   'read concern is set');
+        assert.soon(
+            () => rawMongoProgramOutput().match('5686200'),
+            'Sharded cluster should have warning when upgrading FCV to 5.0 if no cluster-wide ' +
+                'read concern is set',
+            ReplSetTest.kDefaultTimeoutMS);
     }
 
     st.stop();
@@ -79,9 +83,10 @@ function testShardingDowngrade(setCWWC) {
                'Sharded cluster should not have warning when downgrading FCV from 5.0 if ' +
                    'cluster-wide read concern is set');
     } else {
-        assert(rawMongoProgramOutput().match('5686201'),
-               'Sharded cluster should have warning when downgrading FCV from 5.0 if no ' +
-                   'cluster-wide read concern is set');
+        assert.soon(() => rawMongoProgramOutput().match('5686201'),
+                    'Sharded cluster should have warning when downgrading FCV from 5.0 if no ' +
+                        'cluster-wide read concern is set',
+                    ReplSetTest.kDefaultTimeoutMS);
     }
 
     st.upgradeCluster('last-lts');
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 94b7a8d4824..755de84daa8 100644
--- a/jstests/multiVersion/upgrade_downgrade_warning_when_no_cwwc_set.js
+++ b/jstests/multiVersion/upgrade_downgrade_warning_when_no_cwwc_set.js
@@ -27,9 +27,11 @@ function testReplSetUpgrade(setCWWC) {
                    'concern is set');
 
     } else {
-        assert(rawMongoProgramOutput().match('5569202'),
-               'Replica set should have warning when upgrading to 5.0 if no cluster-wide write ' +
-                   'concern is set');
+        assert.soon(
+            () => rawMongoProgramOutput().match('5569202'),
+            'Replica set should have warning when upgrading to 5.0 if no cluster-wide write ' +
+                'concern is set',
+            ReplSetTest.kDefaultTimeoutMS);
     }
 
     primary = replTest.getPrimary();
@@ -41,10 +43,11 @@ function testReplSetUpgrade(setCWWC) {
             'Replica set should not have warning when upgrading FCV to 5.0 if cluster-wide write' +
                 ' concern is set');
     } else {
-        assert(
-            rawMongoProgramOutput().match('5569200'),
+        assert.soon(
+            () => rawMongoProgramOutput().match('5569200'),
             'Replica set should have warning when upgrading FCV to 5.0 if no cluster-wide write' +
-                ' concern is set');
+                ' concern is set',
+            ReplSetTest.kDefaultTimeoutMS);
     }
 
     replTest.stopSet();
@@ -68,9 +71,11 @@ function testReplSetDowngrade(setCWWC) {
                'Replica set should not have warning when downgrading FCV from 5.0 if cluster-wide' +
                    ' write concern is set');
     } else {
-        assert(rawMongoProgramOutput().match('5569201'),
-               'Replica set should have warning when downgrading FCV from 5.0 if no cluster-wide' +
-                   ' write concern is set');
+        assert.soon(
+            () => rawMongoProgramOutput().match('5569201'),
+            'Replica set should have warning when downgrading FCV from 5.0 if no cluster-wide' +
+                ' write concern is set',
+            ReplSetTest.kDefaultTimeoutMS);
     }
 
     replTest.upgradeSet({binVersion: "last-lts"});
@@ -108,10 +113,11 @@ function testShardingUpgrade(setCWWC) {
                 ' concern is set');
 
     } else {
-        assert(
-            rawMongoProgramOutput().match('5569202'),
+        assert.soon(
+            () => rawMongoProgramOutput().match('5569202'),
             'Sharded cluster should have warning when upgrading to 5.0 if no cluster-wide write' +
-                ' concern is set');
+                ' concern is set',
+            ReplSetTest.kDefaultTimeoutMS);
     }
 
     jsTestLog("Setting FCV to 5.0");
@@ -122,9 +128,11 @@ function testShardingUpgrade(setCWWC) {
             'Sharded cluster should not have warning when upgrading FCV to 5.0 if cluster-wide ' +
                 'write concern is set');
     } else {
-        assert(rawMongoProgramOutput().match('5569200'),
-               'Sharded cluster should have warning when upgrading FCV to 5.0 if no cluster-wide ' +
-                   'write concern is set');
+        assert.soon(
+            () => rawMongoProgramOutput().match('5569200'),
+            'Sharded cluster should have warning when upgrading FCV to 5.0 if no cluster-wide ' +
+                'write concern is set',
+            ReplSetTest.kDefaultTimeoutMS);
     }
 
     st.stop();
@@ -150,9 +158,10 @@ function testShardingDowngrade(setCWWC) {
                'Sharded cluster should not have warning when downgrading FCV from 5.0 if ' +
                    'cluster-wide write concern is set');
     } else {
-        assert(rawMongoProgramOutput().match('5569201'),
-               'Sharded cluster should have warning when downgrading FCV from 5.0 if no ' +
-                   'cluster-wide write concern is set');
+        assert.soon(() => rawMongoProgramOutput().match('5569201'),
+                    'Sharded cluster should have warning when downgrading FCV from 5.0 if no ' +
+                        'cluster-wide write concern is set',
+                    ReplSetTest.kDefaultTimeoutMS);
     }
 
     st.upgradeCluster('last-lts');