diff --git a/src/borg/testsuite/archiver/return_codes.py b/src/borg/testsuite/archiver/return_codes.py index 5cc8ce33f..74161cccb 100644 --- a/src/borg/testsuite/archiver/return_codes.py +++ b/src/borg/testsuite/archiver/return_codes.py @@ -1,20 +1,20 @@ from ...constants import * # NOQA -from . import cmd, changedir +from . import cmd_fixture, changedir -def test_return_codes(cmd, tmpdir): +def test_return_codes(cmd_fixture, tmpdir): repo = tmpdir.mkdir("repo") input = tmpdir.mkdir("input") output = tmpdir.mkdir("output") input.join("test_file").write("content") - rc, out = cmd("--repo=%s" % str(repo), "rcreate", "--encryption=none") + rc, out = cmd_fixture("--repo=%s" % str(repo), "rcreate", "--encryption=none") assert rc == EXIT_SUCCESS - rc, out = cmd("--repo=%s" % repo, "create", "archive", str(input)) + rc, out = cmd_fixture("--repo=%s" % repo, "create", "archive", str(input)) assert rc == EXIT_SUCCESS with changedir(str(output)): - rc, out = cmd("--repo=%s" % repo, "extract", "archive") + rc, out = cmd_fixture("--repo=%s" % repo, "extract", "archive") assert rc == EXIT_SUCCESS - rc, out = cmd("--repo=%s" % repo, "extract", "archive", "does/not/match") + rc, out = cmd_fixture("--repo=%s" % repo, "extract", "archive", "does/not/match") assert rc == EXIT_WARNING # pattern did not match - rc, out = cmd("--repo=%s" % repo, "create", "archive", str(input)) + rc, out = cmd_fixture("--repo=%s" % repo, "create", "archive", str(input)) assert rc == EXIT_ERROR # duplicate archive name