Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 0 insertions, 23 deletions

diff --git a/src/mongo/db/vector_clock_mongod_test.cpp b/src/mongo/db/vector_clock_mongod_test.cpp
index 5b54310c8ed..9351b6438ff 100644
--- a/src/mongo/db/vector_clock_mongod_test.cpp
+++ b/src/mongo/db/vector_clock_mongod_test.cpp
@@ -34,9 +34,7 @@
 #include "mongo/db/logical_time_validator.h"
 #include "mongo/db/op_observer_impl.h"
 #include "mongo/db/op_observer_registry.h"
-#include "mongo/db/repl/replica_set_aware_service.h"
 #include "mongo/db/repl/replication_coordinator_mock.h"
-#include "mongo/db/s/shard_server_test_fixture.h"
 #include "mongo/db/s/sharding_mongod_test_fixture.h"
 #include "mongo/db/vector_clock_mutable.h"
 #include "mongo/unittest/death_test.h"
@@ -56,9 +54,6 @@ protected:
         : ShardingMongodTestFixture(Options{}.useMockClock(true), false /* setUpMajorityReads */) {}
 
     void setUp() override {
-        // Ensure that this node is neither "config server" nor "shard server".
-        serverGlobalParams.clusterRole = ClusterRole::None;
-
         ShardingMongodTestFixture::setUp();
 
         auto keysCollectionClient = std::make_unique<KeysCollectionClientDirect>();
@@ -294,23 +289,5 @@ TEST_F(VectorClockMongoDTest, GossipInExternal) {
     ASSERT_EQ(afterTime3.topologyTime(), VectorClock::kInitialComponentTime);
 }
 
-class VectorClockMongoDDurableTest : public ShardServerTestFixture {
-protected:
-    VectorClockMongoDDurableTest()
-        : ShardServerTestFixture(Options{}.useMockClock(true), false /* setUpMajorityReads */) {}
-};
-
-TEST_F(VectorClockMongoDDurableTest, DurableTimeDoesNotHangAfterShutdown) {
-    auto sc = getServiceContext();
-    auto vc = VectorClockMutable::get(sc);
-    auto opCtx = Client::getCurrent()->getOperationContext();
-
-    ReplicaSetAwareServiceRegistry::get(sc).onShutdown();
-    shutdownExecutorPool();
-
-    ASSERT_THROWS_CODE(
-        vc->waitForDurable().get(opCtx), DBException, ErrorCodes::ShutdownInProgress);
-}
-
 }  // namespace
 }  // namespace mongo