SERVER-57658 tenant_migration_donor_initial_sync_recovery.js should not always expect for the migration to be committed

(cherry picked from commit f28b72d3f7800a68a7c1ce0b64e3dfc71978029e)

1 files changed, 10 insertions, 1 deletions

diff --git a/jstests/replsets/tenant_migration_donor_initial_sync_recovery.js b/jstests/replsets/tenant_migration_donor_initial_sync_recovery.js
index 2765df9d5f6..09a5571e5d5 100644
--- a/jstests/replsets/tenant_migration_donor_initial_sync_recovery.js
+++ b/jstests/replsets/tenant_migration_donor_initial_sync_recovery.js
@@ -69,6 +69,9 @@ donorRst.waitForState(initialSyncNode, ReplSetTest.State.STARTUP_2);
 // the various migration states.
 hangInDonorAfterReplicatingKeys.off();
 sleep(Math.random() * kMaxSleepTimeMS);
+if (fp) {
+    fp.wait();
+}
 
 jsTestLog("Waiting for initial sync to finish: " + initialSyncNode.port);
 initialSyncNode.getDB('admin').adminCommand(
@@ -143,7 +146,13 @@ if (fp) {
 
 restartServerReplication(initialSyncNode);
 
-TenantMigrationTest.assertCommitted(tenantMigrationTest.waitForMigrationToComplete(migrationOpts));
+if (kMigrationFpNames[index] === "abortTenantMigrationBeforeLeavingBlockingState") {
+    TenantMigrationTest.assertAborted(
+        tenantMigrationTest.waitForMigrationToComplete(migrationOpts));
+} else {
+    TenantMigrationTest.assertCommitted(
+        tenantMigrationTest.waitForMigrationToComplete(migrationOpts));
+}
 assert.commandWorked(tenantMigrationTest.forgetMigration(migrationOpts.migrationIdString));
 tenantMigrationTest.stop();
 })();