From 03f0414ed6c2d6be0842ee75fcd51cbd5861e22a Mon Sep 17 00:00:00 2001
From: Ali Mir <ali.mir@mongodb.com>
Date: Fri, 13 Sep 2024 13:10:28 -0400
Subject: [PATCH] SERVER-94779 Modify ignore_dbcheck_in_magic_restore.js to use
 refactored magic restore test utilities (#27057)

GitOrigin-RevId: 971024bece692e0b3650c10dfd195ec835325496
---
 .../ignore_dbcheck_in_magic_restore.js        | 19 +++++++------------
 ...dbcheck_in_startup_recovery_for_restore.js |  4 ++--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/jstests/replsets/ignore_dbcheck_in_magic_restore.js b/jstests/replsets/ignore_dbcheck_in_magic_restore.js
index 338518d1e9c..f59b21ccef5 100644
--- a/jstests/replsets/ignore_dbcheck_in_magic_restore.js
+++ b/jstests/replsets/ignore_dbcheck_in_magic_restore.js
@@ -4,7 +4,8 @@
  * @tags: [
  *     requires_persistence,
  *     requires_wiredtiger,
- *     featureFlagSecondaryIndexChecksInDbCheck
+ *     featureFlagSecondaryIndexChecksInDbCheck,
+ *     incompatible_with_windows_tls
  * ]
  */
 
@@ -19,12 +20,6 @@ import {
     runDbCheck
 } from "jstests/replsets/libs/dbcheck_utils.js";
 
-// TODO SERVER-86034: Run on Windows machines once named pipe related failures are resolved.
-if (_isWindows()) {
-    jsTestLog("Temporarily skipping test for Windows variants. See SERVER-86034.");
-    quit();
-}
-
 // TODO SERVER-87225: Enable fast count on validate when operations applied during a restore are
 // counted correctly.
 TestData.skipEnforceFastCountOnValidate = true;
@@ -52,14 +47,14 @@ assert.commandWorked(sourceDb.runCommand({
     indexes: [{key: {a: 1}, name: 'a_1'}],
 }));
 assert.eq(sourceColl.find({}).count(), nDocs);
-const skipUnindexingDocumentWhenDeletedPrimary =
-    configureFailPoint(sourceDb, "skipUnindexingDocumentWhenDeleted", {indexName: "a_1"});
+configureFailPoint(sourceDb, "skipUnindexingDocumentWhenDeleted", {indexName: "a_1"});
+
 jsTestLog("Deleting docs");
 assert.commandWorked(sourceColl.deleteMany({}));
 assert.eq(sourceColl.find({}).count(), 0);
 
-const magicRestoreTest = new magicRestoreTest(
-    {backupSource: sourcePrimary, pipeDir: MongoRunner.dataDir, insertHigherTermOplogEntry: true});
+const magicRestoreTest = new MagicRestoreTest(
+    {rst: sourceCluster, pipeDir: MongoRunner.dataDir, insertHigherTermOplogEntry: true});
 
 magicRestoreTest.takeCheckpointAndOpenBackup();
 
@@ -86,7 +81,7 @@ let {lastOplogEntryTs, entriesAfterBackup} = magicRestoreTest.getEntriesAfterBac
 
 magicRestoreTest.copyFilesAndCloseBackup();
 
-let expectedConfig = assert.commandWorked(sourcePrimary.adminCommand({replSetGetConfig: 1})).config;
+let expectedConfig = magicRestoreTest.getExpectedConfig();
 // The new node will be allocated a new port by the test fixture.
 expectedConfig.members[0].host = getHostName() + ":" + (Number(sourcePrimary.port) + 2);
 let restoreConfiguration = {
diff --git a/jstests/replsets/ignore_dbcheck_in_startup_recovery_for_restore.js b/jstests/replsets/ignore_dbcheck_in_startup_recovery_for_restore.js
index 70859bb1c48..53f9834ded1 100644
--- a/jstests/replsets/ignore_dbcheck_in_startup_recovery_for_restore.js
+++ b/jstests/replsets/ignore_dbcheck_in_startup_recovery_for_restore.js
@@ -10,7 +10,7 @@
  * ]
  */
 
-import {_copyFileHelper, openBackupCursor} from "jstests/libs/backup_utils.js";
+import {copyFileHelper, openBackupCursor} from "jstests/libs/backup_utils.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";
 import {
     checkHealthLog,
@@ -95,7 +95,7 @@ jsTestLog("Backup cursor metadata document: " + tojson(backupCursor.next()));
 while (backupCursor.hasNext()) {
     let doc = backupCursor.next();
     jsTestLog("Copying for backup: " + tojson(doc));
-    _copyFileHelper({filename: doc.filename, fileSize: doc.fileSize}, primary.dbpath, backupDbPath);
+    copyFileHelper({filename: doc.filename, fileSize: doc.fileSize}, primary.dbpath, backupDbPath);
 }
 
 backupCursor.close();