SERVER-23103 Make service contexts responsible for creating DBDirectClients

1 files changed, 12 insertions, 2 deletions

diff --git a/src/mongo/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp
index db8815b1e90..8876cd5aa6e 100644
--- a/src/mongo/dbtests/framework.cpp
+++ b/src/mongo/dbtests/framework.cpp
@@ -38,11 +38,13 @@
 #include "mongo/base/status.h"
 #include "mongo/db/client.h"
 #include "mongo/db/concurrency/lock_state.h"
+#include "mongo/db/dbdirectclient.h"
 #include "mongo/db/s/sharding_state.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/service_context_d.h"
 #include "mongo/dbtests/dbtests.h"
 #include "mongo/dbtests/framework_options.h"
+#include "mongo/scripting/dbdirectclient_factory.h"
 #include "mongo/scripting/engine.h"
 #include "mongo/stdx/mutex.h"
 #include "mongo/util/assert_util.h"
@@ -75,11 +77,19 @@ int runDbTests(int argc, char** argv) {
 
     Client::initThread("testsuite");
 
+    auto globalServiceContext = getGlobalServiceContext();
+
+    // DBTests run as if in the database, so allow them to create direct clients.
+    DBDirectClientFactory::get(globalServiceContext)
+        .registerImplementation([](OperationContext* txn) {
+            return std::unique_ptr<DBClientBase>(new DBDirectClient(txn));
+        });
+
     srand((unsigned)frameworkGlobalParams.seed);
     printBuildInfo();
 
-    checked_cast<ServiceContextMongoD*>(getGlobalServiceContext())->createLockFile();
-    getGlobalServiceContext()->initializeGlobalStorageEngine();
+    checked_cast<ServiceContextMongoD*>(globalServiceContext)->createLockFile();
+    globalServiceContext->initializeGlobalStorageEngine();
 
     int ret = unittest::Suite::run(frameworkGlobalParams.suites,
                                    frameworkGlobalParams.filter,