mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pytest4 complains if we directly call the fixture function, fixes #4172 

just added a normal function with the code, call it from fixture and
also from unittest test method.

(cherry picked from commit d0a01c532e)
This commit is contained in:
Thomas Waldmann 2018-11-16 01:30:31 +01:00
parent 7985891992
commit 216d1f810f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/borg/testsuite/archiver.py
View File

@ -55,7 +55,7 @@ from . import has_lchflags, has_llfuse
from . import BaseTestCase, changedir, environment_variable, no_selinux from . import BaseTestCase, changedir, environment_variable, no_selinux
from . import are_symlinks_supported, are_hardlinks_supported, are_fifos_supported, is_utime_fully_supported, is_birthtime_fully_supported from . import are_symlinks_supported, are_hardlinks_supported, are_fifos_supported, is_utime_fully_supported, is_birthtime_fully_supported
from .platform import fakeroot_detected from .platform import fakeroot_detected
from .upgrader import attic_repo from .upgrader import make_attic_repo
from . import key from . import key
# 3.4.3 == first version with argparse bugfix for nargs='*' and 0 arguments given # 3.4.3 == first version with argparse bugfix for nargs='*' and 0 arguments given
@ -2877,7 +2877,7 @@ id: 2 / e29442 3506da 4e1ea7 / 25f62a 5a3d41 - 02
assert os.stat('input/dir1/source2').st_nlink == 2 assert os.stat('input/dir1/source2').st_nlink == 2
def test_detect_attic_repo(self): def test_detect_attic_repo(self):
path = attic_repo(self.repository_path) path = make_attic_repo(self.repository_path)
cmds = [ cmds = [
['create', path + '::test', self.tmpdir], ['create', path + '::test', self.tmpdir],
['extract', path + '::test'], ['extract', path + '::test'],

12
src/borg/testsuite/upgrader.py
View File

@ -58,16 +58,20 @@ def key_valid(path):
return f.read().startswith(KeyfileKey.FILE_ID) return f.read().startswith(KeyfileKey.FILE_ID)
@pytest.fixture() def make_attic_repo(dir):
def attic_repo(tmpdir):
""" """
create an attic repo with some stuff in it create an attic repo with some stuff in it
:param tmpdir: path to the repository to be created :param dir: path to the repository to be created
:returns: path to attic repository :returns: path to attic repository
""" """
# there is some stuff in that repo, copied from `RepositoryTestCase.test1` # there is some stuff in that repo, copied from `RepositoryTestCase.test1`
return untar(ATTIC_TAR, str(tmpdir), 'repo') return untar(ATTIC_TAR, str(dir), 'repo')
@pytest.fixture()
def attic_repo(tmpdir):
return make_attic_repo(tmpdir)
@pytest.fixture(params=[True, False]) @pytest.fixture(params=[True, False])