[Integ-tests] Simplify checks in memory based scheduling test

hanwen-cluster · hanwen-pcluste · commit 65b1dd587aba · 2024-04-09T08:21:05.000-07:00
Prior to this commit, the code had duplicate checks without retry. It was unnecessary and and caused sporadic failures

Signed-off-by: Hanwen &lt;hanwenli@amazon.com&gt;
diff --git a/tests/integration-tests/tests/schedulers/test_slurm.py b/tests/integration-tests/tests/schedulers/test_slurm.py
@@ -2621,9 +2621,8 @@ def _test_slurm_behavior_when_updating_schedulable_memory_with_already_running_j
         ["/var/log/slurmctld.log"],
         [f"node {node} memory is overallocated"],
     )
-    assert_that(slurm_commands.get_job_info(job_id_1, field="JobState")).is_equal_to("RUNNING")
+    slurm_commands.wait_job_running(job_id_1)
     slurm_commands.wait_job_completed(job_id_1)
-    assert_that(slurm_commands.get_job_info(job_id_1, field="JobState")).is_equal_to("COMPLETED")
 
 
 def _test_scontrol_reboot_nodes(

Original file line number	Diff line number	Diff line change
`@@ -2621,9 +2621,8 @@ def _test_slurm_behavior_when_updating_schedulable_memory_with_already_running_j`
`2621`	`2621`	`["/var/log/slurmctld.log"],`
`2622`	`2622`	`[f"node {node} memory is overallocated"],`
`2623`	`2623`	`)`
`2624`		`- assert_that(slurm_commands.get_job_info(job_id_1, field="JobState")).is_equal_to("RUNNING")`
	`2624`	`+ slurm_commands.wait_job_running(job_id_1)`
`2625`	`2625`	`slurm_commands.wait_job_completed(job_id_1)`
`2626`		`- assert_that(slurm_commands.get_job_info(job_id_1, field="JobState")).is_equal_to("COMPLETED")`
`2627`	`2626`
`2628`	`2627`
`2629`	`2628`	`def _test_scontrol_reboot_nodes(`