diff options
author | Benety Goh <benety@mongodb.com> | 2016-07-26 14:07:32 -0400 |
---|---|---|
committer | Benety Goh <benety@mongodb.com> | 2016-07-26 14:07:32 -0400 |
commit | f73c9cae18ab82e9f2098bef8f4e018c8e9c9113 (patch) | |
tree | 2fe2db98c23e1052b660518135dc15b101908160 /src/mongo/db/repl/multiapplier_test.cpp | |
parent | 4aba6232e628b99f39661d6ab6f9b634887ead4d (diff) | |
download | mongo-f73c9cae18ab82e9f2098bef8f4e018c8e9c9113.tar.gz |
SERVER-25281 renamed MultiApplier lifecycle functions""
Diffstat (limited to 'src/mongo/db/repl/multiapplier_test.cpp')
-rw-r--r-- | src/mongo/db/repl/multiapplier_test.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mongo/db/repl/multiapplier_test.cpp b/src/mongo/db/repl/multiapplier_test.cpp index 96eb72dfc44..e598da3d71e 100644 --- a/src/mongo/db/repl/multiapplier_test.cpp +++ b/src/mongo/db/repl/multiapplier_test.cpp @@ -160,12 +160,12 @@ TEST_F(MultiApplierTest, MultiApplierInvokesCallbackWithCallbackCanceledStatusUp executor::NetworkInterfaceMock::InNetworkGuard guard(net); // Executor cannot run multiApply callback while we are on the network thread. - ASSERT_OK(multiApplier.start()); - multiApplier.cancel(); + ASSERT_OK(multiApplier.startup()); + multiApplier.shutdown(); net->runReadyNetworkOperations(); } - multiApplier.wait(); + multiApplier.join(); ASSERT_FALSE(multiApplyInvoked); @@ -196,13 +196,13 @@ TEST_F(MultiApplierTest, MultiApplierPassesMultiApplyErrorToCallback) { }; MultiApplier multiApplier(&getExecutor(), operations, applyOperation, multiApply, callback); - ASSERT_OK(multiApplier.start()); + ASSERT_OK(multiApplier.startup()); { auto net = getNet(); executor::NetworkInterfaceMock::InNetworkGuard guard(net); net->runReadyNetworkOperations(); } - multiApplier.wait(); + multiApplier.join(); ASSERT_TRUE(multiApplyInvoked); @@ -234,13 +234,13 @@ TEST_F(MultiApplierTest, MultiApplierCatchesMultiApplyExceptionAndConvertsToCall }; MultiApplier multiApplier(&getExecutor(), operations, applyOperation, multiApply, callback); - ASSERT_OK(multiApplier.start()); + ASSERT_OK(multiApplier.startup()); { auto net = getNet(); executor::NetworkInterfaceMock::InNetworkGuard guard(net); net->runReadyNetworkOperations(); } - multiApplier.wait(); + multiApplier.join(); ASSERT_TRUE(multiApplyInvoked); @@ -276,13 +276,13 @@ TEST_F( }; MultiApplier multiApplier(&getExecutor(), operations, applyOperation, multiApply, callback); - ASSERT_OK(multiApplier.start()); + ASSERT_OK(multiApplier.startup()); { auto net = getNet(); executor::NetworkInterfaceMock::InNetworkGuard guard(net); net->runReadyNetworkOperations(); } - multiApplier.wait(); + multiApplier.join(); ASSERT_TRUE(multiApplyTxn); ASSERT_EQUALS(1U, operationsToApply.size()); |