浏览代码

fix borg import issue, add comment, fixes #2718

Thomas Waldmann 8 年之前
父节点
当前提交
2c3cdf8c6c
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      conftest.py

+ 3 - 2
conftest.py

@@ -4,8 +4,6 @@ import sys
 
 import pytest
 
-import borg.cache
-
 # needed to get pretty assertion failures in unit tests:
 if hasattr(pytest, 'register_assert_rewrite'):
     pytest.register_assert_rewrite('borg.testsuite')
@@ -27,6 +25,9 @@ try:
 except ImportError:
     sys.path = original_path
 
+# note: if anything from borg needs to be imported, do it below this line.
+import borg.cache
+
 
 @pytest.fixture(autouse=True)
 def clean_env(tmpdir_factory, monkeypatch):