Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dvc/command/gc.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ def run(self):
all_tags=self.args.all_tags,
all_commits=self.args.all_commits,
workspace=self.args.workspace,
cloud=self.args.cloud,
)

msg = "This will remove all cache except items used in "
Expand Down
1 change: 0 additions & 1 deletion dvc/repo/gc.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def gc(
all_tags=all_tags,
all_commits=all_commits,
all_branches=all_branches,
cloud=cloud,
Comment thread
skshetry marked this conversation as resolved.
)

from contextlib import ExitStack
Expand Down
2 changes: 1 addition & 1 deletion tests/func/test_data_cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ def _test_cloud(self, remote=None):
self.assertTrue(os.path.isfile(cache_dir))

# NOTE: check if remote gc works correctly on directories
self.main(["gc", "-c", "-f"] + args)
self.main(["gc", "-cw", "-f"] + args)
shutil.move(
self.dvc.cache.local.cache_dir,
self.dvc.cache.local.cache_dir + ".back",
Expand Down
23 changes: 22 additions & 1 deletion tests/func/test_gc.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,20 @@ def test_gc_without_workspace_raises_error(tmp_dir, dvc):
dvc.gc(force=True, workspace=False)


def test_gc_cloud_with_or_without_specifier(tmp_dir, erepo_dir):
dvc = erepo_dir.dvc
with erepo_dir.chdir():
from dvc.exceptions import InvalidArgumentError

with pytest.raises(InvalidArgumentError):
dvc.gc(force=True, cloud=True)

dvc.gc(cloud=True, all_tags=True)
dvc.gc(cloud=True, all_commits=True)
dvc.gc(cloud=True, all_branches=True)
dvc.gc(cloud=True, all_commits=False, all_branches=True, all_tags=True)


def test_gc_without_workspace_on_tags_branches_commits(tmp_dir, dvc):
dvc.gc(force=True, all_tags=True)
dvc.gc(force=True, all_commits=True)
Expand All @@ -253,6 +267,13 @@ def test_gc_without_workspace(tmp_dir, dvc, caplog):
assert "Invalid Arguments" in caplog.text


def test_gc_cloud_without_any_specifier(tmp_dir, dvc, caplog):
with caplog.at_level(logging.WARNING, logger="dvc"):
assert main(["gc", "-cvf"]) == 255

assert "Invalid Arguments" in caplog.text


def test_gc_with_possible_args_positive(tmp_dir, dvc):
for flag in [
"-w",
Expand All @@ -274,5 +295,5 @@ def test_gc_cloud_positive(tmp_dir, dvc, tmp_path_factory):

dvc.push()

for flag in ["-c", "-ca", "-cT", "-caT", "-cwT"]:
for flag in ["-cw", "-ca", "-cT", "-caT", "-cwT"]:
assert main(["gc", "-vf", flag]) == 0