diff options
Diffstat (limited to 'src/mongo/db/catalog')
| -rw-r--r-- | src/mongo/db/catalog/README.md | 4 | ||||
| -rw-r--r-- | src/mongo/db/catalog/catalog_test_fixture.h | 4 | ||||
| -rw-r--r-- | src/mongo/db/catalog/collection_validation_test.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/catalog/database_test.cpp | 6 |
4 files changed, 1 insertions, 15 deletions
diff --git a/src/mongo/db/catalog/README.md b/src/mongo/db/catalog/README.md index ddb5d479da2..b08f9d59be6 100644 --- a/src/mongo/db/catalog/README.md +++ b/src/mongo/db/catalog/README.md @@ -23,11 +23,9 @@ directory. [**sorter/**]: https://github.com/mongodb/mongo/tree/master/src/mongo/db/sorter [**timeseries/**]: https://github.com/mongodb/mongo/tree/master/src/mongo/db/timeseries -For more information on the Storage Engine API, see the [storage/README][]. For additional -specifics on the Ephemeral for Test storage engine, see the [ephemeral_for_test/README][]. +For more information on the Storage Engine API, see the [storage/README][]. [storage/README]: https://github.com/mongodb/mongo/blob/master/src/mongo/db/storage/README.md -[ephemeral_for_test/README]: https://github.com/mongodb/mongo/blob/master/src/mongo/db/storage/ephemeral_for_test/README.md # The Catalog diff --git a/src/mongo/db/catalog/catalog_test_fixture.h b/src/mongo/db/catalog/catalog_test_fixture.h index b71933fa317..b60b2de088f 100644 --- a/src/mongo/db/catalog/catalog_test_fixture.h +++ b/src/mongo/db/catalog/catalog_test_fixture.h @@ -43,10 +43,6 @@ namespace mongo { */ class CatalogTestFixture : public ServiceContextMongoDTest { public: - /** - * Allows selection of storage engine to back the unit test, defaulting to ephemeralForTest - * when not specified. - */ explicit CatalogTestFixture(Options options = {}) : ServiceContextMongoDTest(std::move(options)) {} diff --git a/src/mongo/db/catalog/collection_validation_test.cpp b/src/mongo/db/catalog/collection_validation_test.cpp index 4ffff4f653b..e3b5a1a9742 100644 --- a/src/mongo/db/catalog/collection_validation_test.cpp +++ b/src/mongo/db/catalog/collection_validation_test.cpp @@ -204,7 +204,6 @@ int setUpInvalidData(OperationContext* opCtx) { // Verify that calling validate() on an empty collection with different validation levels returns an // OK status. TEST_F(CollectionValidationTest, ValidateEmpty) { - // Running on the ephemeralForTest storage engine. foregroundValidate(operationContext(), /*valid*/ true, /*numRecords*/ 0, @@ -212,7 +211,6 @@ TEST_F(CollectionValidationTest, ValidateEmpty) { /*numErrors*/ 0); } TEST_F(CollectionValidationTest, BackgroundValidateEmpty) { - // Running on the WT storage engine. backgroundValidate(operationContext(), /*valid*/ true, /*numRecords*/ 0, diff --git a/src/mongo/db/catalog/database_test.cpp b/src/mongo/db/catalog/database_test.cpp index 59308be7233..e9da3e319ee 100644 --- a/src/mongo/db/catalog/database_test.cpp +++ b/src/mongo/db/catalog/database_test.cpp @@ -148,12 +148,6 @@ TEST_F(DatabaseTest, CreateCollectionThrowsExceptionWhenDatabaseIsInADropPending WriteUnitOfWork wuow(_opCtx.get()); - // If createCollection() unexpectedly succeeds, we need to commit the collection - // creation to - // avoid leaving the ephemeralForTest storage engine in a bad state for subsequent - // tests. - ON_BLOCK_EXIT([&wuow] { wuow.commit(); }); - ASSERT_THROWS_CODE_AND_WHAT(db->createCollection(_opCtx.get(), _nss), AssertionException, ErrorCodes::DatabaseDropPending, |