diff options
author | Andy Schwerin <schwerin@mongodb.com> | 2015-07-16 12:19:33 -0400 |
---|---|---|
committer | Andy Schwerin <schwerin@mongodb.com> | 2015-07-21 14:21:52 -0400 |
commit | 923fcee186e7f1f4a908c9a8ff62fb30c23d5dc5 (patch) | |
tree | cb82a42e0f00c73c6430e94b7e1beef41def4efe /src/mongo/db/repl | |
parent | 88e9fd1a09afb37e61937e585b334685d75c757a (diff) | |
download | mongo-923fcee186e7f1f4a908c9a8ff62fb30c23d5dc5.tar.gz |
SERVER-19492 Use ThreadPoolTaskExecutor instead of ReplicationExecutor in unit tests.
The fetcher test is excluded at present, because it appears to depend on some
implementation behavior of ReplicationExecutor that remains to be diagnosed.
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r-- | src/mongo/db/repl/replication_executor_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/replication_executor_test_fixture.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/replication_executor_test_fixture.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/repl/replication_executor_test.cpp b/src/mongo/db/repl/replication_executor_test.cpp index 527d0eb310b..fb6639b788c 100644 --- a/src/mongo/db/repl/replication_executor_test.cpp +++ b/src/mongo/db/repl/replication_executor_test.cpp @@ -58,7 +58,7 @@ const int64_t prngSeed = 1; MONGO_INITIALIZER(ReplExecutorCommonTests)(InitializerContext*) { mongo::executor::addTestsForExecutor( "ReplicationExecutorCommon", - [](std::unique_ptr<executor::NetworkInterface>* net) { + [](std::unique_ptr<executor::NetworkInterfaceMock>* net) { return stdx::make_unique<ReplicationExecutor>( net->release(), new StorageInterfaceMock(), prngSeed); }); diff --git a/src/mongo/db/repl/replication_executor_test_fixture.cpp b/src/mongo/db/repl/replication_executor_test_fixture.cpp index 8d2172eb291..2ee87f372de 100644 --- a/src/mongo/db/repl/replication_executor_test_fixture.cpp +++ b/src/mongo/db/repl/replication_executor_test_fixture.cpp @@ -52,7 +52,7 @@ void ReplicationExecutorTest::postExecutorThreadLaunch() { } std::unique_ptr<executor::TaskExecutor> ReplicationExecutorTest::makeTaskExecutor( - std::unique_ptr<executor::NetworkInterface> net) { + std::unique_ptr<executor::NetworkInterfaceMock> net) { _storage = new StorageInterfaceMock(); return stdx::make_unique<ReplicationExecutor>(net.release(), _storage, prngSeed); } diff --git a/src/mongo/db/repl/replication_executor_test_fixture.h b/src/mongo/db/repl/replication_executor_test_fixture.h index f7bd59a8672..73e5ae2c504 100644 --- a/src/mongo/db/repl/replication_executor_test_fixture.h +++ b/src/mongo/db/repl/replication_executor_test_fixture.h @@ -60,7 +60,7 @@ protected: private: std::unique_ptr<executor::TaskExecutor> makeTaskExecutor( - std::unique_ptr<executor::NetworkInterface> net) override; + std::unique_ptr<executor::NetworkInterfaceMock> net) override; StorageInterfaceMock* _storage{nullptr}; |