From 79df0765ef9d8f6cd948a4abb92807572b45e5a3 Mon Sep 17 00:00:00 2001 From: Guido Petretto Date: Wed, 26 Jun 2024 11:38:09 +0200 Subject: [PATCH] rename fixture --- src/jobflow_remote/jobs/runner.py | 1 - tests/db/cli/test_admin.py | 2 +- tests/db/cli/test_flow.py | 29 +++++++++++++++++------------ tests/db/cli/test_job.py | 16 ++++++++-------- tests/db/conftest.py | 2 +- tests/db/jobs/test_jobcontroller.py | 2 +- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/jobflow_remote/jobs/runner.py b/src/jobflow_remote/jobs/runner.py index c31f6a87..ee9141b3 100644 --- a/src/jobflow_remote/jobs/runner.py +++ b/src/jobflow_remote/jobs/runner.py @@ -412,7 +412,6 @@ def run_one_job( if job_id: query["uuid"] = job_id[0] query["index"] = job_id[1] - print(query) job_data = self.job_controller.checkout_job(query=query) if not job_data: if not db_id and not job_id: diff --git a/tests/db/cli/test_admin.py b/tests/db/cli/test_admin.py index 9967effd..778d7ea0 100644 --- a/tests/db/cli/test_admin.py +++ b/tests/db/cli/test_admin.py @@ -1,7 +1,7 @@ import pytest -def test_reset(job_controller, four_jobs): +def test_reset(job_controller, two_flows_four_jobs): from jobflow_remote.testing.cli import run_check_cli run_check_cli( diff --git a/tests/db/cli/test_flow.py b/tests/db/cli/test_flow.py index 0b2729f7..f52c3e6d 100644 --- a/tests/db/cli/test_flow.py +++ b/tests/db/cli/test_flow.py @@ -1,7 +1,7 @@ import pytest -def test_flows_list(job_controller, four_jobs): +def test_flows_list(job_controller, two_flows_four_jobs): from jobflow_remote.testing.cli import run_check_cli columns = ["DB id", "Name", "State", "Flow id", "Num Jobs", "Last updated"] @@ -17,23 +17,25 @@ def test_flows_list(job_controller, four_jobs): run_check_cli(["flow", "list", "-m", "1"], required_out=outputs) outputs = ["READY"] - run_check_cli(["flow", "list", "-fid", four_jobs[0].uuid], required_out=outputs) + run_check_cli( + ["flow", "list", "-fid", two_flows_four_jobs[0].uuid], required_out=outputs + ) -def test_delete(job_controller, four_jobs): +def test_delete(job_controller, two_flows_four_jobs): from jobflow_remote.jobs.runner import Runner from jobflow_remote.jobs.state import JobState from jobflow_remote.testing.cli import run_check_cli # run one of the jobs to check that the output is not deleted runner = Runner() - job_1_uuid = four_jobs[0].jobs[0].uuid + job_1_uuid = two_flows_four_jobs[0].jobs[0].uuid runner.run_one_job(job_id=(job_1_uuid, 1)) assert job_controller.get_job_doc(job_id=job_1_uuid).state == JobState.COMPLETED assert job_controller.jobstore.get_output(job_1_uuid) == 6 run_check_cli( - ["flow", "delete", "-fid", four_jobs[0].uuid], + ["flow", "delete", "-fid", two_flows_four_jobs[0].uuid], required_out="Deleted Flow", cli_input="y", ) @@ -42,15 +44,18 @@ def test_delete(job_controller, four_jobs): # run the command without returning any match run_check_cli( - ["flow", "delete", "-fid", four_jobs[0].uuid], + ["flow", "delete", "-fid", two_flows_four_jobs[0].uuid], required_out="No flows matching criteria", ) # don't confirm and verbose option # only check the first characters of the uuid because it may be cut in the output - outputs = ["This operation will delete the following 1 Flow", four_jobs[1].uuid[:5]] + outputs = [ + "This operation will delete the following 1 Flow", + two_flows_four_jobs[1].uuid[:5], + ] run_check_cli( - ["flow", "delete", "-fid", four_jobs[1].uuid, "-v"], + ["flow", "delete", "-fid", two_flows_four_jobs[1].uuid, "-v"], required_out=outputs, cli_input="n", ) @@ -58,14 +63,14 @@ def test_delete(job_controller, four_jobs): # run one job and delete with the outputs runner = Runner() - job_2_uuid = four_jobs[1].jobs[0].uuid + job_2_uuid = two_flows_four_jobs[1].jobs[0].uuid runner.run_one_job(job_id=(job_2_uuid, 1)) assert job_controller.get_job_doc(job_id=job_2_uuid).state == JobState.COMPLETED assert job_controller.jobstore.get_output(job_2_uuid) == 6 - outputs = [f"Deleted Flow(s) with id: {four_jobs[1].uuid}"] + outputs = [f"Deleted Flow(s) with id: {two_flows_four_jobs[1].uuid}"] run_check_cli( - ["flow", "delete", "-fid", four_jobs[1].uuid, "-o"], + ["flow", "delete", "-fid", two_flows_four_jobs[1].uuid, "-o"], required_out=outputs, cli_input="y", ) @@ -76,7 +81,7 @@ def test_delete(job_controller, four_jobs): job_controller.jobstore.get_output(job_2_uuid) -def test_flow_info(job_controller, four_jobs): +def test_flow_info(job_controller, two_flows_four_jobs): from jobflow_remote.testing.cli import run_check_cli columns = ["DB id", "Name", "State", "Job id", "(Index)", "Worker"] diff --git a/tests/db/cli/test_job.py b/tests/db/cli/test_job.py index 74ffe56b..9d6e3b66 100644 --- a/tests/db/cli/test_job.py +++ b/tests/db/cli/test_job.py @@ -1,4 +1,4 @@ -def test_jobs_list(job_controller, four_jobs): +def test_jobs_list(job_controller, two_flows_four_jobs): from jobflow_remote.jobs.state import JobState from jobflow_remote.testing.cli import run_check_cli @@ -30,7 +30,7 @@ def test_jobs_list(job_controller, four_jobs): ) -def test_job_info(job_controller, four_jobs): +def test_job_info(job_controller, two_flows_four_jobs): from jobflow_remote.testing.cli import run_check_cli outputs = ["name = 'add1'", "state = 'READY'"] @@ -40,7 +40,7 @@ def test_job_info(job_controller, four_jobs): outputs += excluded_n run_check_cli( - ["job", "info", four_jobs[0].jobs[0].uuid, "-n"], required_out=outputs + ["job", "info", two_flows_four_jobs[0].jobs[0].uuid, "-n"], required_out=outputs ) outputs = ["state = 'READY'", "job = {"] @@ -51,7 +51,7 @@ def test_job_info(job_controller, four_jobs): ) -def test_set_state(job_controller, four_jobs): +def test_set_state(job_controller, two_flows_four_jobs): from jobflow_remote.jobs.state import JobState from jobflow_remote.testing.cli import run_check_cli @@ -66,7 +66,7 @@ def test_set_state(job_controller, four_jobs): ) -def test_rerun(job_controller, four_jobs): +def test_rerun(job_controller, two_flows_four_jobs): from jobflow_remote.jobs.state import JobState from jobflow_remote.testing.cli import run_check_cli @@ -81,7 +81,7 @@ def test_rerun(job_controller, four_jobs): run_check_cli(["job", "rerun", "-did", "1"], required_out="Error while rerunning") -def test_retry(job_controller, four_jobs): +def test_retry(job_controller, two_flows_four_jobs): from jobflow_remote.jobs.state import JobState from jobflow_remote.testing.cli import run_check_cli @@ -96,7 +96,7 @@ def test_retry(job_controller, four_jobs): run_check_cli(["job", "retry", "-did", "2"], required_out="Error while retrying") -def test_play_pause(job_controller, four_jobs): +def test_play_pause(job_controller, two_flows_four_jobs): from jobflow_remote.jobs.state import JobState from jobflow_remote.testing.cli import run_check_cli @@ -115,7 +115,7 @@ def test_play_pause(job_controller, four_jobs): run_check_cli(["job", "play", "-did", "1"], required_out="Error while playing") -def test_stop(job_controller, four_jobs): +def test_stop(job_controller, two_flows_four_jobs): from jobflow_remote.jobs.state import JobState from jobflow_remote.testing.cli import run_check_cli diff --git a/tests/db/conftest.py b/tests/db/conftest.py index 073ff4bc..8194da6f 100644 --- a/tests/db/conftest.py +++ b/tests/db/conftest.py @@ -182,7 +182,7 @@ def one_job(random_project_name): @pytest.fixture(scope="function") -def four_jobs(random_project_name): +def two_flows_four_jobs(random_project_name): """ Add two flows with two jobs each to the DB """ diff --git a/tests/db/jobs/test_jobcontroller.py b/tests/db/jobs/test_jobcontroller.py index 2bfa79eb..8e9ca5c7 100644 --- a/tests/db/jobs/test_jobcontroller.py +++ b/tests/db/jobs/test_jobcontroller.py @@ -541,7 +541,7 @@ def test_set_job_doc_properties(job_controller, one_job): assert job_controller.get_job_doc(job_id=one_job[0].uuid).job.metadata == {"x": "y"} -def test_reset(job_controller, four_jobs): +def test_reset(job_controller, two_flows_four_jobs): assert job_controller.count_jobs() == 4 assert not job_controller.reset(max_limit=1)