From 02681f2e6523f0b73ee306c1042ee0747c72dc9a Mon Sep 17 00:00:00 2001 From: karajan1001 Date: Wed, 29 Jun 2022 13:59:18 +0800 Subject: [PATCH] Rename _all to all_ remove some tricky func test. --- dvc/commands/queue/remove.py | 2 +- dvc/repo/experiments/queue/remove.py | 4 +- tests/func/experiments/test_queue.py | 79 ++++--------------- tests/unit/command/test_queue.py | 2 +- .../repo/experiments/queue/test_remove.py | 2 +- 5 files changed, 22 insertions(+), 67 deletions(-) diff --git a/dvc/commands/queue/remove.py b/dvc/commands/queue/remove.py index 15641dc4c..635f80e64 100644 --- a/dvc/commands/queue/remove.py +++ b/dvc/commands/queue/remove.py @@ -14,7 +14,7 @@ class CmdQueueRemove(CmdBase): def run(self): removed_list = self.repo.experiments.celery_queue.remove( revs=self.args.task, - _all=self.args.all, + all_=self.args.all, success=self.args.success, queued=self.args.queued, failed=self.args.failed, diff --git a/dvc/repo/experiments/queue/remove.py b/dvc/repo/experiments/queue/remove.py index edf0c89ca..7de2813f6 100644 --- a/dvc/repo/experiments/queue/remove.py +++ b/dvc/repo/experiments/queue/remove.py @@ -131,7 +131,7 @@ def remove( queued: bool = False, failed: bool = False, success: bool = False, - _all: bool = False, + all_: bool = False, ) -> List[str]: """Remove the specified entries from the queue. @@ -145,7 +145,7 @@ def remove( Returns: Revisions (or names) which were removed. """ - if _all: + if all_: queued = failed = success = True if queued or failed or success: return self.clear(failed=failed, success=success, queued=queued) diff --git a/tests/func/experiments/test_queue.py b/tests/func/experiments/test_queue.py index 2303b0cfe..f610e0300 100644 --- a/tests/func/experiments/test_queue.py +++ b/tests/func/experiments/test_queue.py @@ -11,22 +11,6 @@ def to_dict(tasks): return status_dict -@pytest.fixture -def queued_tasks(tmp_dir, dvc, scm, exp_stage): - queue_length = 3 - name_list = [] - for i in range(queue_length): - name = f"queued{i}" - name_list.append(name) - dvc.experiments.run( - exp_stage.addressing, - params=[f"foo={i+2*queue_length}"], - queue=True, - name=name, - ) - return ["queued0", "queued1", "queued2"] - - @pytest.fixture def success_tasks(tmp_dir, dvc, scm, test_queue, exp_stage): queue_length = 3 @@ -42,7 +26,7 @@ def success_tasks(tmp_dir, dvc, scm, test_queue, exp_stage): @pytest.fixture -def failed_tasks(tmp_dir, dvc, scm, test_queue, failed_exp_stage, capsys): +def failed_tasks(tmp_dir, dvc, scm, test_queue, failed_exp_stage): queue_length = 3 name_list = [] for i in range(queue_length): @@ -55,8 +39,6 @@ def failed_tasks(tmp_dir, dvc, scm, test_queue, failed_exp_stage, capsys): name=name, ) dvc.experiments.run(run_all=True) - output = capsys.readouterr() - assert "Failed to reproduce experiment" in output.err return name_list @@ -82,68 +64,41 @@ def test_celery_logs( assert "failed to reproduce 'failed-copy-file'" in captured.out -def test_queue_status(dvc, failed_tasks, success_tasks, queued_tasks): - assert len(dvc.experiments.stash_revs) == 3 +def test_queue_remove_done(dvc, failed_tasks, success_tasks): assert len(dvc.experiments.celery_queue.failed_stash) == 3 status = to_dict(dvc.experiments.celery_queue.status()) - assert len(status) == 9 - for task in failed_tasks: - assert status[task] == "Failed" - for task in success_tasks: - assert status[task] == "Success" - for task in queued_tasks: - assert status[task] == "Queued" - - -def test_queue_remove(dvc, failed_tasks, success_tasks, queued_tasks): - assert len(dvc.experiments.stash_revs) == 3 - assert len(dvc.experiments.celery_queue.failed_stash) == 3 - assert len(dvc.experiments.celery_queue.status()) == 9 + assert len(status) == 6 + for name in failed_tasks: + assert status[name] == "Failed" + for name in success_tasks: + assert status[name] == "Success" with pytest.raises(InvalidArgumentError): dvc.experiments.celery_queue.remove(failed_tasks[:2] + ["non-exist"]) - assert len(dvc.experiments.celery_queue.status()) == 9 + assert len(dvc.experiments.celery_queue.status()) == 6 - to_remove = failed_tasks[:2] + success_tasks[1:] + queued_tasks[1:2] + to_remove = [failed_tasks[0], success_tasks[2]] assert set(dvc.experiments.celery_queue.remove(to_remove)) == set( to_remove ) - assert len(dvc.experiments.stash_revs) == 2 - assert len(dvc.experiments.celery_queue.failed_stash) == 1 + assert len(dvc.experiments.celery_queue.failed_stash) == 2 status = to_dict(dvc.experiments.celery_queue.status()) - assert set(status) == set( - queued_tasks[:1] - + queued_tasks[2:] - + success_tasks[:1] - + failed_tasks[2:] - ) - assert status[queued_tasks[0]] == "Queued" - assert status[queued_tasks[2]] == "Queued" - - assert ( - dvc.experiments.celery_queue.remove([], queued=True) - == queued_tasks[:1] + queued_tasks[2:] - ) - - assert len(dvc.experiments.stash_revs) == 0 - assert len(dvc.experiments.celery_queue.failed_stash) == 1 - assert len(dvc.experiments.celery_queue.status()) == 2 + assert set(status) == set(failed_tasks[1:] + success_tasks[:2]) assert ( dvc.experiments.celery_queue.remove([], failed=True) - == failed_tasks[2:] + == failed_tasks[1:] ) - assert len(dvc.experiments.stash_revs) == 0 assert len(dvc.experiments.celery_queue.failed_stash) == 0 - assert len(dvc.experiments.celery_queue.status()) == 1 + assert set(to_dict(dvc.experiments.celery_queue.status())) == set( + success_tasks[:2] + ) assert ( dvc.experiments.celery_queue.remove([], success=True) - == success_tasks[:1] + == success_tasks[:2] ) - assert len(dvc.experiments.stash_revs) == 0 - assert len(dvc.experiments.celery_queue.failed_stash) == 0 - assert len(dvc.experiments.celery_queue.status()) == 0 + assert dvc.experiments.celery_queue.status() == [] diff --git a/tests/unit/command/test_queue.py b/tests/unit/command/test_queue.py index 34a8bf5a6..00f39e8ac 100644 --- a/tests/unit/command/test_queue.py +++ b/tests/unit/command/test_queue.py @@ -33,7 +33,7 @@ def test_experiments_remove(dvc, scm, mocker): assert cmd.run() == 0 remove_mocker.assert_called_once_with( revs=["exp1", "exp2"], - _all=True, + all_=True, success=True, failed=True, queued=True, diff --git a/tests/unit/repo/experiments/queue/test_remove.py b/tests/unit/repo/experiments/queue/test_remove.py index 3557a9d34..7fae111ef 100644 --- a/tests/unit/repo/experiments/queue/test_remove.py +++ b/tests/unit/repo/experiments/queue/test_remove.py @@ -129,5 +129,5 @@ def test_remove_all(test_queue, mocker): clear_mocker = mocker.patch.object( test_queue, "clear", return_value=mocker.Mock() ) - test_queue.remove([], _all=True) + test_queue.remove([], all_=True) assert clear_mocker.called_once_with(queud=True, failed=True, success=True)