summaryrefslogtreecommitdiff
path: root/src/mongo/s/query/async_results_merger_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/s/query/async_results_merger_test.cpp')
-rw-r--r--src/mongo/s/query/async_results_merger_test.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mongo/s/query/async_results_merger_test.cpp b/src/mongo/s/query/async_results_merger_test.cpp
index 662d78e6dd0..64428771bb0 100644
--- a/src/mongo/s/query/async_results_merger_test.cpp
+++ b/src/mongo/s/query/async_results_merger_test.cpp
@@ -74,7 +74,6 @@ public:
AsyncResultsMergerTest() {}
void setUp() override {
- ShardingTestFixture::setUp();
setRemote(HostAndPort("ClientHost", 12345));
configTargeter()->setFindHostReturnValue(kTestConfigShardHost);
@@ -100,10 +99,6 @@ public:
setupShards(shards);
}
- void tearDown() override {
- ShardingTestFixture::tearDown();
- }
-
protected:
/**
* Constructs an ARM with the given vector of existing cursors.
@@ -2072,7 +2067,8 @@ DEATH_TEST_F(AsyncResultsMergerTest,
params.setOperationSessionInfo(sessionInfo);
// This should trigger an invariant.
- stdx::make_unique<AsyncResultsMerger>(operationContext(), executor(), std::move(params));
+ ASSERT_FALSE(
+ stdx::make_unique<AsyncResultsMerger>(operationContext(), executor(), std::move(params)));
}
DEATH_TEST_F(AsyncResultsMergerTest,