Revert "[Test] Remove validation of Torque wrapper from slurm tests."

This reverts commit 699cb16.

Author: hanwen-cluster

tests/integration-tests/tests/schedulers/test_slurm.py

@@ -56,7 +56,7 @@
     wait_for_num_nodes_in_scheduler,
 )
 from tests.common.scaling_common import setup_ec2_launch_override_to_emulate_ice
-from tests.common.schedulers_common import SlurmCommands
+from tests.common.schedulers_common import SlurmCommands, TorqueCommands
 
 
 @pytest.mark.usefixtures("instance", "os")
@@ -120,6 +120,8 @@ def test_slurm(
         max_count=5,
         gpu_instance_type_info=gpu_instance_type_info,
     )
+    # Test torque command wrapper
+    _test_torque_job_submit(remote_command_executor, test_datadir)
 
     # Tests below must run on HeadNode or need HeadNode participate.
     head_node_command_executor = RemoteCommandExecutor(cluster)
@@ -239,6 +241,8 @@ def test_slurm_from_login_nodes_in_private_network(
         max_count=5,
         gpu_instance_type_info=gpu_instance_type_info,
     )
+    # Test torque command wrapper
+    _test_torque_job_submit(remote_command_executor, test_datadir)
     head_node_command_executor = RemoteCommandExecutor(cluster)
     assert_no_errors_in_logs(head_node_command_executor, "slurm")
 
@@ -1805,6 +1809,14 @@ def _assert_job_state(slurm_commands, job_id, job_state):
         assert_that(e.result.stdout).contains("slurm_load_jobs error: Invalid job id specified")
 
 
+def _test_torque_job_submit(remote_command_executor, test_datadir):
+    """Test torque job submit command in slurm cluster."""
+    logging.info("Testing cluster submits job by torque command")
+    torque_commands = TorqueCommands(remote_command_executor)
+    result = torque_commands.submit_script(str(test_datadir / "torque_job.sh"))
+    torque_commands.assert_job_submitted(result.stdout)
+
+
 def _submit_kill_networking_job(remote_command_executor, scheduler_commands, partition, node_type, num_nodes):
     """Submit job that will detach network interface on compute."""
     # Get network interface name from Head node, assuming Head node and Compute are of the same instance type

tests/integration-tests/tests/schedulers/test_slurm/test_slurm/torque_job.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "qsub executed successfully"