From aaf72e3861f976529dc9eb160373a299d7035a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 15 Oct 2015 18:12:12 -0400 Subject: [PATCH] do not skip all attic tests, some work without now --- borg/testsuite/upgrader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/borg/testsuite/upgrader.py b/borg/testsuite/upgrader.py index f931af23e..b509b237e 100644 --- a/borg/testsuite/upgrader.py +++ b/borg/testsuite/upgrader.py @@ -16,9 +16,6 @@ from ..helpers import get_keys_dir from ..key import KeyfileKey from ..repository import Repository, MAGIC -pytestmark = pytest.mark.skipif(attic is None, - reason='cannot find an attic install') - def repo_valid(path): """ @@ -67,6 +64,7 @@ def attic_repo(tmpdir): def inplace(request): return request.param +@pytest.mark.skipif(attic is None, reason='cannot find an attic install') def test_convert_segments(tmpdir, attic_repo, inplace): """test segment conversion @@ -126,6 +124,7 @@ def attic_key_file(attic_repo, tmpdir): MockArgs(keys_dir)) +@pytest.mark.skipif(attic is None, reason='cannot find an attic install') def test_keys(tmpdir, attic_repo, attic_key_file): """test key conversion @@ -144,6 +143,7 @@ def test_keys(tmpdir, attic_repo, attic_key_file): assert key_valid(attic_key_file.path) +@pytest.mark.skipif(attic is None, reason='cannot find an attic install') def test_convert_all(tmpdir, attic_repo, attic_key_file, inplace): """test all conversion steps