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

hanwen-cluster · hanwen-pcluste · commit d1474d39800d · 2024-04-18T13:09:46.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
@@ -2588,9 +2588,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
`@@ -2588,9 +2588,8 @@ def _test_slurm_behavior_when_updating_schedulable_memory_with_already_running_j`
`2588`	`2588`	`["/var/log/slurmctld.log"],`
`2589`	`2589`	`[f"node {node} memory is overallocated"],`
`2590`	`2590`	`)`
`2591`		`- assert_that(slurm_commands.get_job_info(job_id_1, field="JobState")).is_equal_to("RUNNING")`
	`2591`	`+ slurm_commands.wait_job_running(job_id_1)`
`2592`	`2592`	`slurm_commands.wait_job_completed(job_id_1)`
`2593`		`- assert_that(slurm_commands.get_job_info(job_id_1, field="JobState")).is_equal_to("COMPLETED")`
`2594`	`2593`
`2595`	`2594`
`2596`	`2595`	`def _test_scontrol_reboot_nodes(`