From 73215ff0f12b1bcc0c284c6a87234b7642547b4c Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Tue, 2 May 2023 12:58:47 -0600 Subject: [PATCH 1/2] Another test --- tests/test_queueadapter.py | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/tests/test_queueadapter.py b/tests/test_queueadapter.py index 7c4b6460..5e458047 100644 --- a/tests/test_queueadapter.py +++ b/tests/test_queueadapter.py @@ -369,6 +369,10 @@ def test_submit_job_remote(self): with self.assertRaises(NotImplementedError): self.remote.submit_job(queue="remote", dependency_list=[]) + def test_submit_job_empty_working_directory(self): + with self.assertRaises(ValueError): + self.slurm.submit_job(working_directory=" ") + def test_memory_string_comparison(self): self.assertEqual(BasisQueueAdapter._value_in_range(1023, value_min="1K"), "1K") self.assertEqual(BasisQueueAdapter._value_in_range(1035, value_min="1K"), 1035) @@ -412,3 +416,38 @@ def test_memory_string_comparison(self): ), "60G", ) + + def test_write_queue(self): + with self.assertRaises(ValueError): + self.slurm._adapter._write_queue_script( + queue=None, + job_name=None, + working_directory=None, + cores=None, + memory_max=None, + run_time_max=None, + command=None + ) + self.slurm._adapter._write_queue_script( + queue="slurm", + job_name=None, + working_directory=None, + cores=None, + memory_max=None, + run_time_max=None, + command="echo \"hello\"" + ) + with open("run_queue.sh", "r") as f: + content = f.read() + output = """\ +#!/bin/bash +#SBATCH --output=time.out +#SBATCH --job-name=None +#SBATCH --chdir=. +#SBATCH --get-user-env=L +#SBATCH --partition=slurm +#SBATCH --time=4320 +#SBATCH --cpus-per-task=10 + +echo \"hello\"""" + self.assertEqual(content, output) From 4cb1cdb3754a78a537d656d22fb8c765cc742e88 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Tue, 2 May 2023 12:59:29 -0600 Subject: [PATCH 2/2] remove file after test --- tests/test_queueadapter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_queueadapter.py b/tests/test_queueadapter.py index 5e458047..3fbeed13 100644 --- a/tests/test_queueadapter.py +++ b/tests/test_queueadapter.py @@ -451,3 +451,4 @@ def test_write_queue(self): echo \"hello\"""" self.assertEqual(content, output) + os.remove("run_queue.sh")