diff options
Diffstat (limited to 'src/mongo/db/db_raii_test.cpp')
| -rw-r--r-- | src/mongo/db/db_raii_test.cpp | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/mongo/db/db_raii_test.cpp b/src/mongo/db/db_raii_test.cpp index 5a60b752977..776afdfa0aa 100644 --- a/src/mongo/db/db_raii_test.cpp +++ b/src/mongo/db/db_raii_test.cpp @@ -116,10 +116,10 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadCollLockDeadline) { ASSERT(client1.second->lockState()->isCollectionLockedForMode(nss, MODE_X)); failsWithLockTimeout( [&] { - AutoGetCollectionForRead acfr(client2.second.get(), - nss, - AutoGetCollectionViewMode::kViewsForbidden, - Date_t::now() + timeoutMs); + AutoGetCollectionForRead acfr( + client2.second.get(), + nss, + AutoGetCollection::Options{}.deadline(Date_t::now() + timeoutMs)); }, timeoutMs); } @@ -129,10 +129,10 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDBLockDeadline) { ASSERT(client1.second->lockState()->isDbLockedForMode(nss.dbName(), MODE_X)); failsWithLockTimeout( [&] { - AutoGetCollectionForRead coll(client2.second.get(), - nss, - AutoGetCollectionViewMode::kViewsForbidden, - Date_t::now() + timeoutMs); + AutoGetCollectionForRead coll( + client2.second.get(), + nss, + AutoGetCollection::Options{}.deadline(Date_t::now() + timeoutMs)); }, timeoutMs); } @@ -142,10 +142,10 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadGlobalLockDeadline) { ASSERT(client1.second->lockState()->isLocked()); failsWithLockTimeout( [&] { - AutoGetCollectionForRead coll(client2.second.get(), - nss, - AutoGetCollectionViewMode::kViewsForbidden, - Date_t::now() + timeoutMs); + AutoGetCollectionForRead coll( + client2.second.get(), + nss, + AutoGetCollection::Options{}.deadline(Date_t::now() + timeoutMs)); }, timeoutMs); } @@ -158,10 +158,8 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDeadlineNow) { failsWithLockTimeout( [&] { - AutoGetCollectionForRead coll(client2.second.get(), - nss, - AutoGetCollectionViewMode::kViewsForbidden, - Date_t::now()); + AutoGetCollectionForRead coll( + client2.second.get(), nss, AutoGetCollection::Options{}.deadline(Date_t::now())); }, Milliseconds(0)); } @@ -175,7 +173,7 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDeadlineMin) { failsWithLockTimeout( [&] { AutoGetCollectionForRead coll( - client2.second.get(), nss, AutoGetCollectionViewMode::kViewsForbidden, Date_t()); + client2.second.get(), nss, AutoGetCollection::Options{}.deadline(Date_t())); }, Milliseconds(0)); } |