diff options
Diffstat (limited to 'buildscripts/resmokelib/testing/fixtures/shardedcluster.py')
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/shardedcluster.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/shardedcluster.py b/buildscripts/resmokelib/testing/fixtures/shardedcluster.py index 354dfd290f0..60d0750e7e7 100644 --- a/buildscripts/resmokelib/testing/fixtures/shardedcluster.py +++ b/buildscripts/resmokelib/testing/fixtures/shardedcluster.py @@ -8,7 +8,6 @@ import pymongo import pymongo.errors import buildscripts.resmokelib.testing.fixtures.interface as interface -import buildscripts.resmokelib.utils.registry as registry class ShardedClusterFixture(interface.Fixture): # pylint: disable=too-many-instance-attributes @@ -281,7 +280,8 @@ class ShardedClusterFixture(interface.Fixture): # pylint: disable=too-many-inst replset_config_options["configsvr"] = True mongod_options = self.mongod_options.copy() - mongod_options.update( + mongod_options = self.fixturelib.merge_mongo_option_dicts( + mongod_options, self.fixturelib.make_historic(configsvr_options.pop("mongod_options", {}))) mongod_options["configsvr"] = "" mongod_options["dbpath"] = os.path.join(self._dbpath_prefix, "config") @@ -321,8 +321,8 @@ class ShardedClusterFixture(interface.Fixture): # pylint: disable=too-many-inst replset_config_options["configsvr"] = False mongod_options = self.mongod_options.copy() - mongod_options.update( - self.fixturelib.make_historic(shard_options.pop("mongod_options", {}))) + mongod_options = self.fixturelib.merge_mongo_option_dicts( + mongod_options, self.fixturelib.make_historic(shard_options.pop("mongod_options", {}))) mongod_options["shardsvr"] = "" mongod_options["dbpath"] = os.path.join(self._dbpath_prefix, "shard{}".format(index)) mongod_options["replSet"] = self._SHARD_REPLSET_NAME_PREFIX + str(index) |