diff options
| author | David Bradford <david.bradford@mongodb.com> | 2020-03-17 11:36:12 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-17 22:38:58 +0000 |
| commit | 554f868654e9b58fee625a7d3e9e8a5287f41f39 (patch) | |
| tree | 78fb3f6086c11249311906963dae7c2b21d63ab5 /buildscripts | |
| parent | 70345ec48ccbfd3e4a6c357ec862b573b31f5f52 (diff) | |
| download | mongo-554f868654e9b58fee625a7d3e9e8a5287f41f39.tar.gz | |
SERVER-46914: Stop looking at multiversion configuration for non-multiversion burn_in_tests
(cherry picked from commit 25958fcf957165d8cf70802a5473c3fab22cff26)
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/burn_in_tests.py | 3 | ||||
| -rw-r--r-- | buildscripts/tests/test_burn_in_tests.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py index 62b9c13c6c5..5b626c03abf 100644 --- a/buildscripts/burn_in_tests.py +++ b/buildscripts/burn_in_tests.py @@ -583,10 +583,11 @@ def create_generate_tasks_config( """ task_list = TaskList(evg_config) resmoke_options = repeat_config.generate_resmoke_options() + mv_repl_tasks = evg_project_config.get_task_names_by_tag(RANDOM_MULTIVERSION_REPLSETS_TAG) for task in sorted(tests_by_task): test_list = tests_by_task[task]["tests"] for index, test in enumerate(test_list): - if task in evg_project_config.get_task_names_by_tag(RANDOM_MULTIVERSION_REPLSETS_TAG): + if generate_config.use_multiversion and task in mv_repl_tasks: # Exclude files that should be blacklisted from multiversion testing. task_name = gen_resmoke.remove_gen_suffix(task) files_to_exclude = gen_multiversion.get_exclude_files(task_name, TASK_PATH_SUFFIX) diff --git a/buildscripts/tests/test_burn_in_tests.py b/buildscripts/tests/test_burn_in_tests.py index bf207ddb37a..352cd9ec191 100644 --- a/buildscripts/tests/test_burn_in_tests.py +++ b/buildscripts/tests/test_burn_in_tests.py @@ -108,8 +108,11 @@ class TestAcceptance(unittest.TestCase): "project", use_multiversion=False ) # yapf: disable + evg_conf_mock = MagicMock() + evg_conf_mock.get_task_names_by_tag.return_value = set() - under_test.burn_in(repeat_config, gen_config, "", "testfile.json", False, None, repo, None) + under_test.burn_in(repeat_config, gen_config, "", "testfile.json", False, evg_conf_mock, + repo, None) write_json_mock.assert_called_once() written_config = write_json_mock.call_args[0][0] |