Merge branch 'develop' into api

aws · Dec 4, 2024 · c6563e1 · c6563e1
2 parents 7440805 + d836322
commit c6563e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tests/integration-tests/tests/basic/log_rotation_utils.py b/tests/integration-tests/tests/basic/log_rotation_utils.py
@@ -130,6 +130,10 @@ def _test_logs_are_rotated(os, logs, remote_command_executor, before_log_rotatio
         "sync",
         compute_node_ip,
     )
+    # remove date extension to old rotated file
+    _run_command_on_node(
+        remote_command_executor, "sudo sed -i 's/dateext/nodateext/g' /etc/logrotate.conf", compute_node_ip
+    )
     # force log rotate without waiting for logs to reach certain size
     _run_command_on_node(remote_command_executor, "sudo logrotate -f /etc/logrotate.conf", compute_node_ip)
     # check if logs are rotated

diff --git a/tests/integration-tests/tests/basic/test_essential_features.py b/tests/integration-tests/tests/basic/test_essential_features.py
@@ -147,7 +147,6 @@ def _test_mpi_ssh(remote_command_executor, test_datadir, scheduler_commands_fact
 
     # mpirun_out_ip = ["Warning: Permanently added '192.168.60.89' (ECDSA) to the list of known hosts.",
     # '', 'ip-192-168-60-89']
-    assert_that(len(mpirun_out_ip)).is_equal_to(3)
     assert_that(mpirun_out_ip[-1]).is_equal_to(remote_host)
 
     mpirun_out = remote_command_executor.run_remote_script(
@@ -156,7 +155,6 @@ def _test_mpi_ssh(remote_command_executor, test_datadir, scheduler_commands_fact
 
     # mpirun_out = ["Warning: Permanently added 'ip-192-168-60-89,192.168.60.89' (ECDSA) to the list of known hosts.",
     # '', 'ip-192-168-60-89']
-    assert_that(len(mpirun_out)).is_equal_to(3)
     assert_that(mpirun_out[-1]).is_equal_to(remote_host)