summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/database_sharding_state_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/s/database_sharding_state_test.cpp')
-rw-r--r--src/mongo/db/s/database_sharding_state_test.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mongo/db/s/database_sharding_state_test.cpp b/src/mongo/db/s/database_sharding_state_test.cpp
index fff4ed3cccd..81d5218dbd4 100644
--- a/src/mongo/db/s/database_sharding_state_test.cpp
+++ b/src/mongo/db/s/database_sharding_state_test.cpp
@@ -94,16 +94,14 @@ public:
StaticCatalogClient(std::vector<ShardType> shards) : _shards(std::move(shards)) {}
StatusWith<repl::OpTimeWith<std::vector<ShardType>>> getAllShards(
- OperationContext* opCtx,
- repl::ReadConcernLevel readConcern,
- bool excludeDraining) override {
+ OperationContext* opCtx, repl::ReadConcernLevel readConcern) override {
return repl::OpTimeWith<std::vector<ShardType>>(_shards);
}
- std::vector<CollectionType> getCollections(OperationContext* opCtx,
- StringData dbName,
- repl::ReadConcernLevel readConcernLevel,
- const BSONObj& sort) override {
+ std::vector<CollectionType> getCollections(
+ OperationContext* opCtx,
+ StringData dbName,
+ repl::ReadConcernLevel readConcernLevel) override {
return _colls;
}
@@ -170,7 +168,7 @@ TEST_F(DatabaseShardingStateTestWithMockedLoader, ForceDatabaseRefresh) {
auto opCtx = operationContext();
_mockCatalogCacheLoader->setDatabaseRefreshReturnValue(newDb);
- ASSERT_OK(onDbVersionMismatchNoExcept(opCtx, kDbName, boost::none));
+ forceDatabaseRefresh(opCtx, kDbName);
boost::optional<DatabaseVersion> activeDbVersion = [&] {
AutoGetDb autoDb(opCtx, kDbName, MODE_IS);