diff options
| author | David Bradford <david.bradford@mongodb.com> | 2020-03-23 13:26:57 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-24 14:36:35 +0000 |
| commit | 8f32ba76afa83456e47aefe683ce55b3da0dbdae (patch) | |
| tree | 39d1f8af4ba28945903ec3cdd528e8c4a22b99fe | |
| parent | 112d665a4060c0c419e0b1a5e8d9d63f82f26f07 (diff) | |
| download | mongo-8f32ba76afa83456e47aefe683ce55b3da0dbdae.tar.gz | |
SERVER-47054: Don't fail due to long timeout values on mainline builds
| -rwxr-xr-x | buildscripts/evergreen_generate_resmoke_tasks.py | 3 | ||||
| -rw-r--r-- | buildscripts/tests/test_evergreen_generate_resmoke_tasks.py | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/buildscripts/evergreen_generate_resmoke_tasks.py b/buildscripts/evergreen_generate_resmoke_tasks.py index 1f729bc271d..0f9996de01f 100755 --- a/buildscripts/evergreen_generate_resmoke_tasks.py +++ b/buildscripts/evergreen_generate_resmoke_tasks.py @@ -622,7 +622,8 @@ class EvergreenConfigGenerator(object): LOGGER.debug("Setting exec_timeout", exec_timeout=exec_timeout, suite_runtime=expected_suite_runtime, factor=repeat_factor) - if timeout > MAX_EXPECTED_TIMEOUT or exec_timeout > MAX_EXPECTED_TIMEOUT: + if self.options.is_patch and \ + (timeout > MAX_EXPECTED_TIMEOUT or exec_timeout > MAX_EXPECTED_TIMEOUT): frameinfo = getframeinfo(currentframe()) LOGGER.error( "This task looks like it is expected to run far longer than normal. This is " diff --git a/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py b/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py index cc2774de148..e0f84f7c06d 100644 --- a/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py +++ b/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py @@ -740,6 +740,17 @@ class EvergreenConfigGeneratorTest(unittest.TestCase): under_test.EvergreenConfigGenerator(shrub_config, suites, options, MagicMock()).generate_config() + def test_evg_config_does_not_fails_if_timeout_too_high_on_mainline(self): + shrub_config = Configuration() + options = self.generate_mock_options() + options.is_patch = False + options.repeat_suites = under_test.MAX_EXPECTED_TIMEOUT + suites = self.generate_mock_suites(3) + + config = under_test.EvergreenConfigGenerator(shrub_config, suites, options, + MagicMock()).generate_config().to_map() + self.assertEqual(len(config["tasks"]), len(suites) + 1) + def test_evg_config_does_not_overwrite_repeatSuites_resmoke_arg_with_repeatSuites_default(self): shrub_config = Configuration() options = self.generate_mock_options() |