Skip to content

Commit 699cb16

Browse files
gmarcianihanwen-cluster
authored andcommitted
[Test] Remove validation of Torque wrapper from slurm tests.
We do not support Torque since ParallelCluster 3.0.0, and we have never supported Torque Wrapper, so there is no reason in validating it, especially if it creates operational burden.
1 parent 7adae16 commit 699cb16

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
wait_for_num_nodes_in_scheduler,
5757
)
5858
from tests.common.scaling_common import setup_ec2_launch_override_to_emulate_ice
59-
from tests.common.schedulers_common import SlurmCommands, TorqueCommands
59+
from tests.common.schedulers_common import SlurmCommands
6060

6161

6262
@pytest.mark.usefixtures("instance", "os")
@@ -120,8 +120,6 @@ def test_slurm(
120120
max_count=5,
121121
gpu_instance_type_info=gpu_instance_type_info,
122122
)
123-
# Test torque command wrapper
124-
_test_torque_job_submit(remote_command_executor, test_datadir)
125123

126124
# Tests below must run on HeadNode or need HeadNode participate.
127125
head_node_command_executor = RemoteCommandExecutor(cluster)
@@ -241,8 +239,6 @@ def test_slurm_from_login_nodes_in_private_network(
241239
max_count=5,
242240
gpu_instance_type_info=gpu_instance_type_info,
243241
)
244-
# Test torque command wrapper
245-
_test_torque_job_submit(remote_command_executor, test_datadir)
246242
head_node_command_executor = RemoteCommandExecutor(cluster)
247243
assert_no_errors_in_logs(head_node_command_executor, "slurm")
248244

@@ -1809,14 +1805,6 @@ def _assert_job_state(slurm_commands, job_id, job_state):
18091805
assert_that(e.result.stdout).contains("slurm_load_jobs error: Invalid job id specified")
18101806

18111807

1812-
def _test_torque_job_submit(remote_command_executor, test_datadir):
1813-
"""Test torque job submit command in slurm cluster."""
1814-
logging.info("Testing cluster submits job by torque command")
1815-
torque_commands = TorqueCommands(remote_command_executor)
1816-
result = torque_commands.submit_script(str(test_datadir / "torque_job.sh"))
1817-
torque_commands.assert_job_submitted(result.stdout)
1818-
1819-
18201808
def _submit_kill_networking_job(remote_command_executor, scheduler_commands, partition, node_type, num_nodes):
18211809
"""Submit job that will detach network interface on compute."""
18221810
# 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

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)