diff --git a/tests/test_gent.py b/tests/test_gent.py index b4d5a5e..6eaac32 100644 --- a/tests/test_gent.py +++ b/tests/test_gent.py @@ -56,12 +56,12 @@ def test_interfaces(self): def test__list_command_to_be_executed(self): with self.subTest("gent"): self.assertEqual( - self.gent._adapter._list_command_to_be_executed(None, "here"), + self.gent._adapter._list_command_to_be_executed("here"), ["sbatch", "--parsable", "here"], ) with self.subTest("gent with dependency"): self.assertRaises( - NotImplementedError, + TypeError, self.gent._adapter._list_command_to_be_executed, [], "here", diff --git a/tests/test_lsf.py b/tests/test_lsf.py index da1ca61..8dcf025 100644 --- a/tests/test_lsf.py +++ b/tests/test_lsf.py @@ -53,12 +53,12 @@ def test_interfaces(self): def test__list_command_to_be_executed(self): with self.subTest("lsf"): self.assertEqual( - self.lsf._adapter._list_command_to_be_executed(None, "here"), + self.lsf._adapter._list_command_to_be_executed("here"), ["bsub", "here"], ) with self.subTest("lsf with dependency"): self.assertRaises( - NotImplementedError, + TypeError, self.lsf._adapter._list_command_to_be_executed, [], "here", diff --git a/tests/test_moab.py b/tests/test_moab.py index 303e9d9..99c2020 100644 --- a/tests/test_moab.py +++ b/tests/test_moab.py @@ -42,13 +42,13 @@ def test_interfaces(self): def test__list_command_to_be_executed(self): with self.subTest("moab with dependency"): self.assertRaises( - NotImplementedError, + TypeError, self.moab._adapter._list_command_to_be_executed, [], "here", ) with self.subTest("moab"): self.assertEqual( - self.moab._adapter._list_command_to_be_executed(None, "here"), + self.moab._adapter._list_command_to_be_executed("here"), ["msub", "here"], ) diff --git a/tests/test_sge.py b/tests/test_sge.py index 9b1b53f..9922320 100644 --- a/tests/test_sge.py +++ b/tests/test_sge.py @@ -110,12 +110,12 @@ def test_interfaces(self): def test__list_command_to_be_executed(self): with self.subTest("sge"): self.assertEqual( - self.sge._adapter._list_command_to_be_executed(None, "here"), + self.sge._adapter._list_command_to_be_executed("here"), ["qsub", "-terse", "here"], ) with self.subTest("sge with dependency"): self.assertRaises( - NotImplementedError, + TypeError, self.sge._adapter._list_command_to_be_executed, [], "here", diff --git a/tests/test_slurm.py b/tests/test_slurm.py index 7ae67f7..d7b4f05 100644 --- a/tests/test_slurm.py +++ b/tests/test_slurm.py @@ -71,19 +71,9 @@ def test_interfaces(self): def test__list_command_to_be_executed(self): with self.subTest("slurm"): self.assertEqual( - self.slurm._adapter._list_command_to_be_executed(None, "here"), + self.slurm._adapter._list_command_to_be_executed("here"), ["sbatch", "--parsable", "here"], ) - with self.subTest("slurm with one dependency"): - self.assertEqual( - self.slurm._adapter._list_command_to_be_executed(["2"], "here"), - ["sbatch", "--parsable", "--dependency=afterok:2", "here"], - ) - with self.subTest("slurm with two dependencies"): - self.assertEqual( - self.slurm._adapter._list_command_to_be_executed(["2", "34"], "here"), - ["sbatch", "--parsable", "--dependency=afterok:2,34", "here"], - ) def test_convert_queue_status_slurm(self): with open(os.path.join(self.path, "config/slurm", "squeue_output"), "r") as f: diff --git a/tests/test_torque.py b/tests/test_torque.py index cdbe1a5..0a10d1a 100644 --- a/tests/test_torque.py +++ b/tests/test_torque.py @@ -41,12 +41,12 @@ def test_interfaces(self): def test__list_command_to_be_executed(self): with self.subTest("torque"): self.assertEqual( - self.torque._adapter._list_command_to_be_executed(None, "here"), + self.torque._adapter._list_command_to_be_executed("here"), ["qsub", "here"], ) with self.subTest("torque with dependency"): self.assertRaises( - NotImplementedError, + TypeError, self.torque._adapter._list_command_to_be_executed, [], "here",