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

diff --git a/src/mongo/db/s/implicit_collection_creation_test.cpp b/src/mongo/db/s/implicit_collection_creation_test.cpp
index 478b2aaa815..02dbe9ed456 100644
--- a/src/mongo/db/s/implicit_collection_creation_test.cpp
+++ b/src/mongo/db/s/implicit_collection_creation_test.cpp
@@ -32,7 +32,6 @@
 #include "mongo/platform/basic.h"
 
 #include "mongo/db/catalog_raii.h"
-#include "mongo/db/s/collection_sharding_runtime.h"
 #include "mongo/db/s/operation_sharding_state.h"
 #include "mongo/db/s/shard_server_test_fixture.h"
 #include "mongo/unittest/unittest.h"
@@ -63,25 +62,6 @@ TEST_F(ImplicitCollectionCreationTest, AllowImplicitCollectionCreate) {
     WriteUnitOfWork wuow(operationContext());
     ASSERT_OK(db->userCreateNS(operationContext(), nss, CollectionOptions{}));
     wuow.commit();
-
-    auto* const csr = CollectionShardingRuntime::get(operationContext(), nss);
-    auto csrLock = CollectionShardingRuntime::CSRLock::lockShared(operationContext(), csr);
-    ASSERT_TRUE(csr->getCurrentMetadataIfKnown());
-}
-
-TEST_F(ImplicitCollectionCreationTest, AllowImplicitCollectionCreateWithSetCSRAsUnknown) {
-    NamespaceString nss("AllowImplicitCollectionCreateDB.TestColl");
-    OperationShardingState::ScopedAllowImplicitCollectionCreate_UNSAFE unsafeCreateCollection(
-        operationContext(), /* forceCSRAsUnknownAfterCollectionCreation */ true);
-    AutoGetCollection autoColl(operationContext(), nss, MODE_IX);
-    auto db = autoColl.ensureDbExists(operationContext());
-    WriteUnitOfWork wuow(operationContext());
-    ASSERT_OK(db->userCreateNS(operationContext(), nss, CollectionOptions{}));
-    wuow.commit();
-
-    auto* const csr = CollectionShardingRuntime::get(operationContext(), nss);
-    auto csrLock = CollectionShardingRuntime::CSRLock::lockShared(operationContext(), csr);
-    ASSERT_FALSE(csr->getCurrentMetadataIfKnown());
 }
 
 }  // namespace