diff options
| author | Benety Goh <benety@mongodb.com> | 2018-12-21 05:57:36 -0500 |
|---|---|---|
| committer | Benety Goh <benety@mongodb.com> | 2018-12-21 05:57:36 -0500 |
| commit | 6acd02f6395669be9a470bdc4b2689c5e889b050 (patch) | |
| tree | a503a5763312b78b61d9d361802ba16096ebc738 /src/mongo/db/catalog_raii_test.cpp | |
| parent | bfddc5baaaa6cbbed435c7749cc740ecadd154f9 (diff) | |
| download | mongo-6acd02f6395669be9a470bdc4b2689c5e889b050.tar.gz | |
SERVER-38719 unshim and remove DatabaseHolder::getDatabaseHolder()
This adds the requirement for a DatabaseHolder instance to be registered
with the global service context at startup.
Diffstat (limited to 'src/mongo/db/catalog_raii_test.cpp')
| -rw-r--r-- | src/mongo/db/catalog_raii_test.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mongo/db/catalog_raii_test.cpp b/src/mongo/db/catalog_raii_test.cpp index cec4811b245..ec6fc7ae330 100644 --- a/src/mongo/db/catalog_raii_test.cpp +++ b/src/mongo/db/catalog_raii_test.cpp @@ -34,6 +34,7 @@ #include <string> +#include "mongo/db/catalog/database_holder_mock.h" #include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/d_concurrency.h" @@ -62,8 +63,15 @@ public: const Milliseconds timeoutMs = Seconds(1); const ClientAndCtx client1 = makeClientWithLocker("client1"); const ClientAndCtx client2 = makeClientWithLocker("client2"); + +private: + void setUp() override; }; +void CatalogRAIITestFixture::setUp() { + DatabaseHolder::set(getServiceContext(), std::make_unique<DatabaseHolderMock>()); +} + void failsWithLockTimeout(stdx::function<void()> func, Milliseconds timeoutMillis) { Date_t t1 = Date_t::now(); try { |