upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-08 16:23:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1965 from borgbackup/pytest2

Browse source 
conftest: pytest 2 compat
This commit is contained in:
enkore 2016-12-17 15:58:07 +01:00 committed by GitHub
commit 0b32524cda
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conftest.py
View file

@ -5,7 +5,8 @@ import sys
import pytest
# needed to get pretty assertion failures in unit tests:
pytest.register_assert_rewrite('borg.testsuite')
if hasattr(pytest, 'register_assert_rewrite'):
pytest.register_assert_rewrite('borg.testsuite')
# This is a hack to fix path problems because "borg" (the package) is in the source root.
# When importing the conftest an "import borg" can incorrectly import the borg from the