SERVER-48775 Move all Sharding unit-tests that assume a MongoD to the db/s directory

With this change there are no more references from mongo/s (which is
code common between MongoS and MongoD) and mongo/db/s (which is code
specific for MongoD only).

1 files changed, 2 insertions, 5 deletions

diff --git a/src/mongo/db/service_context_d_test_fixture.h b/src/mongo/db/service_context_d_test_fixture.h
index 0b25498a1a9..00f5f37883f 100644
--- a/src/mongo/db/service_context_d_test_fixture.h
+++ b/src/mongo/db/service_context_d_test_fixture.h
@@ -29,17 +29,15 @@
 
 #pragma once
 
-#include "mongo/db/operation_context.h"
 #include "mongo/db/service_context_test_fixture.h"
 #include "mongo/unittest/temp_dir.h"
-#include "mongo/unittest/unittest.h"
 
 namespace mongo {
 
 /**
  * Test fixture class for tests that use the "ephemeralForTest" storage engine.
  */
-class ServiceContextMongoDTest : public ServiceContextTest {
+class ServiceContextMongoDTest : public virtual ServiceContextTest {
 protected:
     enum class RepairAction { kNoRepair, kRepair };
 
@@ -52,8 +50,6 @@ protected:
     ServiceContextMongoDTest(std::string engine, RepairAction repair);
     virtual ~ServiceContextMongoDTest();
 
-    void setUp() override;
-
     void tearDown() override;
 
 private:
@@ -62,6 +58,7 @@ private:
         bool engineSetByUser;
         bool repair;
     } _stashedStorageParams;
+
     unittest::TempDir _tempDir;
 };