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, 9 deletions

diff --git a/src/mongo/db/repl/topology_version_observer_test.cpp b/src/mongo/db/repl/topology_version_observer_test.cpp
index d7ee56b4778..6d7d54d57b8 100644
--- a/src/mongo/db/repl/topology_version_observer_test.cpp
+++ b/src/mongo/db/repl/topology_version_observer_test.cpp
@@ -42,9 +42,7 @@
 #include "mongo/db/repl/replication_coordinator_impl.h"
 #include "mongo/db/repl/replication_coordinator_test_fixture.h"
 #include "mongo/db/repl/topology_version_observer.h"
-#include "mongo/logv2/log.h"
 #include "mongo/unittest/barrier.h"
-#include "mongo/unittest/log_test.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/clock_source.h"
@@ -120,9 +118,6 @@ protected:
     const Milliseconds sleepTime = Milliseconds(100);
 
     std::unique_ptr<TopologyVersionObserver> observer;
-
-    unittest::MinimumLoggedSeverityGuard severityGuard{logv2::LogComponent::kDefault,
-                                                       logv2::LogSeverity::Debug(4)};
 };
 
 
@@ -145,15 +140,11 @@ TEST_F(TopologyVersionObserverTest, UpdateCache) {
     auto electionTimeoutWhen = getReplCoord()->getElectionTimeout_forTest();
     simulateSuccessfulV1ElectionWithoutExitingDrainMode(electionTimeoutWhen, opCtx.get());
 
-    auto sleepCounter = 0;
     // Wait for the observer to update its cache
     while (observer->getCached()->getTopologyVersion()->getCounter() ==
            cachedResponse->getTopologyVersion()->getCounter()) {
         sleepFor(sleepTime);
-        // Make sure the test doesn't wait here for longer than 15 seconds.
-        ASSERT_LTE(sleepCounter++, 150);
     }
-    LOGV2(9326401, "Observer topology incremented after successful election");
 
     auto newResponse = observer->getCached();
     ASSERT(newResponse && newResponse->getTopologyVersion());