Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 21 insertions, 27 deletions

diff --git a/buildscripts/tests/test_evergreen_task_timeout.py b/buildscripts/tests/test_evergreen_task_timeout.py
index 294c50d0a17..b3e4e201d96 100644
--- a/buildscripts/tests/test_evergreen_task_timeout.py
+++ b/buildscripts/tests/test_evergreen_task_timeout.py
@@ -110,7 +110,7 @@ class TestTimeoutOverrides(unittest.TestCase):
 
 class TestDetermineExecTimeout(unittest.TestCase):
     def _validate_exec_timeout(self, idle_timeout, exec_timeout, historic_timeout, evg_alias,
-                               build_variant, display_name, timeout_override, expected_timeout):
+                               build_variant, timeout_override, expected_timeout):
         task_name = "task_name"
         variant = build_variant
         overrides = {}
@@ -121,9 +121,8 @@ class TestDetermineExecTimeout(unittest.TestCase):
 
         orchestrator = under_test.TaskTimeoutOrchestrator(
             timeout_service=MagicMock(spec_set=TimeoutService),
-            timeout_overrides=mock_timeout_overrides, evg_project_config=MagicMock(
-                spec_set=EvergreenProjectConfig,
-                get_variant=MagicMock(return_value=MagicMock(display_name=display_name))))
+            timeout_overrides=mock_timeout_overrides,
+            evg_project_config=MagicMock(spec_set=EvergreenProjectConfig))
 
         actual_timeout = orchestrator.determine_exec_timeout(
             task_name, variant, idle_timeout, exec_timeout, evg_alias, historic_timeout)
@@ -133,83 +132,78 @@ class TestDetermineExecTimeout(unittest.TestCase):
     def test_timeout_used_if_specified(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=timedelta(seconds=42),
                                     historic_timeout=None, evg_alias=None, build_variant="variant",
-                                    display_name="not required", timeout_override=None,
-                                    expected_timeout=timedelta(seconds=42))
+                                    timeout_override=None, expected_timeout=timedelta(seconds=42))
 
     def test_default_is_returned_with_no_timeout(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=None, historic_timeout=None,
-                                    evg_alias=None, build_variant="variant",
-                                    display_name="not required", timeout_override=None,
+                                    evg_alias=None, build_variant="variant", timeout_override=None,
                                     expected_timeout=under_test.DEFAULT_NON_REQUIRED_BUILD_TIMEOUT)
 
     def test_default_is_returned_with_timeout_at_zero(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=timedelta(seconds=0),
                                     historic_timeout=None, evg_alias=None, build_variant="variant",
-                                    display_name="not required", timeout_override=None,
+                                    timeout_override=None,
                                     expected_timeout=under_test.DEFAULT_NON_REQUIRED_BUILD_TIMEOUT)
 
     def test_default_required_returned_on_required_variants(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=None, historic_timeout=None,
                                     evg_alias=None, build_variant="variant-required",
-                                    display_name="! required", timeout_override=None,
+                                    timeout_override=None,
                                     expected_timeout=under_test.DEFAULT_REQUIRED_BUILD_TIMEOUT)
 
     def test_override_on_required_should_use_override(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=None, historic_timeout=None,
                                     evg_alias=None, build_variant="variant-required",
-                                    display_name="! required", timeout_override=3 * 60,
+                                    timeout_override=3 * 60,
                                     expected_timeout=timedelta(minutes=3 * 60))
 
     def test_task_specific_timeout(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=timedelta(seconds=0),
                                     historic_timeout=None, evg_alias=None, build_variant="variant",
-                                    display_name="not required", timeout_override=60,
-                                    expected_timeout=timedelta(minutes=60))
+                                    timeout_override=60, expected_timeout=timedelta(minutes=60))
 
     def test_commit_queue_items_use_commit_queue_timeout(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=None, historic_timeout=None,
                                     evg_alias=under_test.COMMIT_QUEUE_ALIAS,
-                                    build_variant="variant", display_name="not required",
-                                    timeout_override=None,
+                                    build_variant="variant", timeout_override=None,
                                     expected_timeout=under_test.COMMIT_QUEUE_TIMEOUT)
 
     def test_use_idle_timeout_if_greater_than_exec_timeout(self):
         self._validate_exec_timeout(
             idle_timeout=timedelta(hours=2), exec_timeout=timedelta(minutes=10),
-            historic_timeout=None, evg_alias=None, build_variant="variant",
-            display_name="not required", timeout_override=None, expected_timeout=timedelta(hours=2))
+            historic_timeout=None, evg_alias=None, build_variant="variant", timeout_override=None,
+            expected_timeout=timedelta(hours=2))
 
     def test_historic_timeout_should_be_used_if_given(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=None,
                                     historic_timeout=timedelta(minutes=15), evg_alias=None,
-                                    build_variant="variant", display_name="not required",
-                                    timeout_override=None, expected_timeout=timedelta(minutes=15))
+                                    build_variant="variant", timeout_override=None,
+                                    expected_timeout=timedelta(minutes=15))
 
     def test_commit_queue_should_override_historic_timeouts(self):
         self._validate_exec_timeout(
             idle_timeout=None, exec_timeout=None, historic_timeout=timedelta(minutes=15),
-            evg_alias=under_test.COMMIT_QUEUE_ALIAS, build_variant="variant",
-            display_name="not required", timeout_override=None,
+            evg_alias=under_test.COMMIT_QUEUE_ALIAS, build_variant="variant", timeout_override=None,
             expected_timeout=under_test.COMMIT_QUEUE_TIMEOUT)
 
     def test_override_should_override_historic_timeouts(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=None,
                                     historic_timeout=timedelta(minutes=15), evg_alias=None,
-                                    build_variant="variant", display_name="not required",
-                                    timeout_override=33, expected_timeout=timedelta(minutes=33))
+                                    build_variant="variant", timeout_override=33,
+                                    expected_timeout=timedelta(minutes=33))
 
     def test_historic_timeout_should_not_be_overridden_by_required_bv(self):
         self._validate_exec_timeout(idle_timeout=None, exec_timeout=None,
                                     historic_timeout=timedelta(minutes=15), evg_alias=None,
-                                    build_variant="variant-required", display_name="! required",
-                                    timeout_override=None, expected_timeout=timedelta(minutes=15))
+                                    build_variant="variant-required", timeout_override=None,
+                                    expected_timeout=timedelta(minutes=15))
 
     def test_historic_timeout_should_not_be_increase_required_bv_timeout(self):
         self._validate_exec_timeout(
             idle_timeout=None, exec_timeout=None,
             historic_timeout=under_test.DEFAULT_REQUIRED_BUILD_TIMEOUT + timedelta(minutes=30),
-            evg_alias=None, build_variant="variant-required", display_name="! required",
-            timeout_override=None, expected_timeout=under_test.DEFAULT_REQUIRED_BUILD_TIMEOUT)
+            evg_alias=None, build_variant="variant-required", timeout_override=None,
+            expected_timeout=under_test.DEFAULT_REQUIRED_BUILD_TIMEOUT)
 
 
 class TestDetermineIdleTimeout(unittest.TestCase):