diff options
| author | David Bradford <david.bradford@mongodb.com> | 2021-07-15 09:21:22 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-07-27 19:18:48 +0000 |
| commit | 4bbdab7b3ccb5647bb13cca87f2ef5901321c3c9 (patch) | |
| tree | 27eb3e71718e38dc3e19ffdffaa77f95de808e1d | |
| parent | c127d7d57066a6bef1dcb0dadce6238bf7795435 (diff) | |
| download | mongo-4bbdab7b3ccb5647bb13cca87f2ef5901321c3c9.tar.gz | |
SERVER-58576 Improve build variant task gen unit tests
(cherry picked from commit 34116ccb3c6fa3187017f84b424979d8a1f0e33d)
| -rw-r--r-- | buildscripts/evergreen_gen_build_variant.py | 5 | ||||
| -rw-r--r-- | buildscripts/tests/test_evergreen_gen_build_variant.py | 3 | ||||
| -rw-r--r-- | evergreen/generate_build_variant.sh | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/buildscripts/evergreen_gen_build_variant.py b/buildscripts/evergreen_gen_build_variant.py index 4bf805d0122..65597d5aa4d 100644 --- a/buildscripts/evergreen_gen_build_variant.py +++ b/buildscripts/evergreen_gen_build_variant.py @@ -389,7 +389,7 @@ class GenerateBuildVariantOrchestrator: LOGGER.info("Configure task", task_id=task.task_id, priority=priority) self.evg_api.configure_task(task.task_id, priority=priority) - def adjust_gen_tasks_priority(self, gen_tasks: Set[str]) -> None: + def adjust_gen_tasks_priority(self, gen_tasks: Set[str]) -> int: """ Increase the priority of any "_gen" tasks. @@ -407,7 +407,8 @@ class GenerateBuildVariantOrchestrator: if task.display_name in gen_tasks ] - [j.result() for j in jobs] # pylint: disable=expression-not-assigned + results = [j.result() for j in jobs] + return len(results) @click.command() diff --git a/buildscripts/tests/test_evergreen_gen_build_variant.py b/buildscripts/tests/test_evergreen_gen_build_variant.py index a2fa41bd5db..e14689a3169 100644 --- a/buildscripts/tests/test_evergreen_gen_build_variant.py +++ b/buildscripts/tests/test_evergreen_gen_build_variant.py @@ -300,6 +300,7 @@ class TestAdjustGenTasksPriority(unittest.TestCase): ] mock_orchestrator = build_mock_orchestrator(build_task_list=mock_task_list) - mock_orchestrator.adjust_gen_tasks_priority(gen_tasks) + n_tasks_adjusted = mock_orchestrator.adjust_gen_tasks_priority(gen_tasks) + self.assertEqual(len(gen_tasks), n_tasks_adjusted) self.assertEqual(len(gen_tasks), mock_orchestrator.evg_api.configure_task.call_count) diff --git a/evergreen/generate_build_variant.sh b/evergreen/generate_build_variant.sh index 3c11c8c1a8c..215a842c617 100644 --- a/evergreen/generate_build_variant.sh +++ b/evergreen/generate_build_variant.sh @@ -1,4 +1,4 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" cd src |