1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-19 18:36:07 +00:00

Merge pull request #4175 from ThomasWaldmann/pytest4

support Pytest4
This commit is contained in:
TW 2018-11-16 21:52:26 +01:00 committed by GitHub
commit 87262c88f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions

View file

@ -3,7 +3,7 @@ setuptools_scm
pip
virtualenv
tox
pytest<4.0.0
pytest
pytest-xdist
pytest-cov
pytest-benchmark

View file

@ -56,7 +56,7 @@ from . import has_lchflags, has_llfuse
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 .platform import fakeroot_detected
from .upgrader import attic_repo
from .upgrader import make_attic_repo
from . import key
@ -2873,7 +2873,7 @@ id: 2 / e29442 3506da 4e1ea7 / 25f62a 5a3d41 - 02
assert os.stat('input/dir1/source2').st_nlink == 2
def test_detect_attic_repo(self):
path = attic_repo(self.repository_path)
path = make_attic_repo(self.repository_path)
cmds = [
['create', path + '::test', self.tmpdir],
['extract', path + '::test'],

View file

@ -58,16 +58,20 @@ def key_valid(path):
return f.read().startswith(KeyfileKey.FILE_ID)
@pytest.fixture()
def attic_repo(tmpdir):
def make_attic_repo(dir):
"""
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
"""
# 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])