SERVER-64906 Copy applicable Tenant Migration jstests to shard split

1 files changed, 4 insertions, 4 deletions

diff --git a/jstests/serverless/shard_split_wait_for_block_timestamp.js b/jstests/serverless/shard_split_wait_for_block_timestamp.js
index 9399b46f909..1797a8f2f95 100644
--- a/jstests/serverless/shard_split_wait_for_block_timestamp.js
+++ b/jstests/serverless/shard_split_wait_for_block_timestamp.js
@@ -42,26 +42,26 @@ assert.commandWorked(bulk.execute());
 
 jsTestLog("Running commitShardSplit command");
 const firstOperation = test.createSplitOperation(tenantIds);
-assert.isnull(findMigration(donorPrimary, firstOperation.migrationId));
+assert.isnull(findSplitOperation(donorPrimary, firstOperation.migrationId));
 const res = firstOperation.commit({retryOnRetryableErrors: false});
 assert.commandFailed(res);
 assert.eq(res.code, ErrorCodes.TenantMigrationAborted);
 
 firstOperation.forget();
-test.waitForGarbageCollection(firstOperation.migrationId, tenantIds);
+test.cleanupSuccesfulAbortedOrCommitted(firstOperation.migrationId, tenantIds);
 
 jsTestLog("Restarting replication on recipient nodes, and running new split operation");
+test.addRecipientNodes();
 test.recipientNodes.forEach(node => restartServerReplication(node));
 test.donor.awaitReplication();
 test.donor.nodes.forEach(
     node => assert.commandWorked(setParameter(node, "shardSplitTimeoutMS", 60 * 1000)));
 
 const secondOperation = test.createSplitOperation(tenantIds);
-assert.isnull(findMigration(donorPrimary, secondOperation.migrationId));
+assert.isnull(findSplitOperation(donorPrimary, secondOperation.migrationId));
 assert.commandWorked(secondOperation.commit());
 assertMigrationState(donorPrimary, secondOperation.migrationId, "committed");
 
-test.removeRecipientNodesFromDonor();
 secondOperation.forget();
 
 test.waitForGarbageCollection(secondOperation.migrationId, tenantIds);