diff options
Diffstat (limited to 'buildscripts/resmokelib/testing/fixtures/_builder.py')
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/_builder.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/_builder.py b/buildscripts/resmokelib/testing/fixtures/_builder.py index fc4215b807e..e9197d9775b 100644 --- a/buildscripts/resmokelib/testing/fixtures/_builder.py +++ b/buildscripts/resmokelib/testing/fixtures/_builder.py @@ -32,6 +32,13 @@ def make_fixture(class_name, logger, job_num, *args, **kwargs): if class_name not in _FIXTURES: raise ValueError("Unknown fixture class '%s'" % class_name) + + # Special case MongoDFixture or _MongosFixture for now since we only add one option. + # If there's more logic, we should add a builder class for them. + if class_name in ["MongoDFixture", "_MongoSFixture"]: + return _FIXTURES[class_name](logger, job_num, fixturelib, *args, + add_feature_flags=bool(config.ENABLED_FEATURE_FLAGS), **kwargs) + return _FIXTURES[class_name](logger, job_num, fixturelib, *args, **kwargs) @@ -183,9 +190,6 @@ class ReplSetBuilder(FixtureBuilder): new_fixture_port = old_fixture.port new_fixture_mongod_options = replset.get_options_for_mongod(replset_node_index) - if config.ENABLED_FEATURE_FLAGS is not None: - for ff in config.ENABLED_FEATURE_FLAGS: - new_fixture_mongod_options["set_parameters"][ff] = True new_fixture = make_fixture(classes[BinVersionEnum.NEW], mongod_logger, replset.job_num, mongod_executable=executables[BinVersionEnum.NEW], |