diff options
| author | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2015-12-21 12:53:27 -0500 |
|---|---|---|
| committer | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2015-12-21 12:53:27 -0500 |
| commit | dab123e614e64a0dcd4163415dd48532b1a79242 (patch) | |
| tree | ccd0737a94a5bbb416151aa69a1c008817388bb8 | |
| parent | 26e9dec5ab8cad307db7795dd0ff74565396199a (diff) | |
| download | mongo-dab123e614e64a0dcd4163415dd48532b1a79242.tar.gz | |
SERVER-21955 Fix issue with MasterSlaveFixture and CleanEveryN hook.
Avoid constructing new Fixture instances inside
MasterSlaveFixture.setup().
(cherry picked from commit f176586570393247747a3774fafa81812f377433)
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/masterslave.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/masterslave.py b/buildscripts/resmokelib/testing/fixtures/masterslave.py index b3956564614..9a028e053ce 100644 --- a/buildscripts/resmokelib/testing/fixtures/masterslave.py +++ b/buildscripts/resmokelib/testing/fixtures/masterslave.py @@ -53,11 +53,13 @@ class MasterSlaveFixture(interface.ReplFixture): self.slave = None def setup(self): - self.master = self._new_mongod_master() + if self.master is None: + self.master = self._new_mongod_master() self.master.setup() self.port = self.master.port - self.slave = self._new_mongod_slave() + if self.slave is None: + self.slave = self._new_mongod_slave() self.slave.setup() def await_ready(self): |