diff options
Diffstat (limited to 'buildscripts/resmokelib/testing/fixtures/replicaset.py')
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/replicaset.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/replicaset.py b/buildscripts/resmokelib/testing/fixtures/replicaset.py index 67d3e18f3aa..37925aae889 100644 --- a/buildscripts/resmokelib/testing/fixtures/replicaset.py +++ b/buildscripts/resmokelib/testing/fixtures/replicaset.py @@ -41,7 +41,7 @@ class ReplicaSetFixture(interface.ReplFixture): all_nodes_electable=False, use_replica_set_connection_string=None): - interface.ReplFixture.__init__(self, logger, job_num) + interface.ReplFixture.__init__(self, logger, job_num, dbpath_prefix=dbpath_prefix) self.mongod_executable = mongod_executable self.mongod_options = utils.default_if_none(mongod_options, {}) @@ -71,12 +71,7 @@ class ReplicaSetFixture(interface.ReplFixture): if "dbpath" in self.mongod_options: self._dbpath_prefix = self.mongod_options.pop("dbpath") else: - # Command line options override the YAML configuration. - dbpath_prefix = utils.default_if_none(config.DBPATH_PREFIX, dbpath_prefix) - dbpath_prefix = utils.default_if_none(dbpath_prefix, config.DEFAULT_DBPATH_PREFIX) - self._dbpath_prefix = os.path.join(dbpath_prefix, - "job{}".format(self.job_num), - config.FIXTURE_SUBDIR) + self._dbpath_prefix = os.path.join(self._dbpath_prefix, config.FIXTURE_SUBDIR) self.nodes = [] self.replset_name = None @@ -310,9 +305,6 @@ class ReplicaSetFixture(interface.ReplFixture): def get_initial_sync_node(self): return self.initial_sync_node - def get_dbpath(self): - return self._dbpath_prefix - def _new_mongod(self, index, replset_name): """ Returns a standalone.MongoDFixture configured to be used as a |