SERVER-25145 BackgroundSync provides minValid to sync source selection in RECOVERING mode

1 files changed, 8 insertions, 2 deletions

diff --git a/jstests/noPassthrough/minvalid2.js b/jstests/noPassthrough/minvalid2.js
index 2eb167444ad..9931f3998f4 100644
--- a/jstests/noPassthrough/minvalid2.js
+++ b/jstests/noPassthrough/minvalid2.js
@@ -74,9 +74,15 @@ print("8: start up former master");
 clearRawMongoProgramOutput();
 replTest.restart(masterId);
 
-print("9: check former master does not roll back");
+print("9: check former master " + replTest.nodes[masterId].host + " does not select former slave " +
+      slave.host + " as sync source");
+replTest.waitForState(replTest.nodes[masterId], ReplSetTest.State.RECOVERING, 90000);
+
+// Sync source selection will log this message if it does not detect min valid in the sync
+// source candidate's oplog.
 assert.soon(function() {
-    return rawMongoProgramOutput().match("need to rollback, but in inconsistent state");
+    return rawMongoProgramOutput().match(
+        'it does not contain the necessary operations for us to reach a consistent state');
 });
 
 replTest.stopSet(undefined, undefined, {allowedExitCodes: [MongoRunner.EXIT_ABRUPT]});