Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

[bcachefs-tools-debian] / tests / conftest.py

diff --git a/tests/conftest.py b/tests/conftest.py
index c656eda03156116e23f676ec714d728b98c1ef76..ffc2bad28da7cf6a6d9d03f412697f59806e1103 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,7 +3,7 @@
 # pytest fixture definitions.
 
 import pytest
-import util
+from tests import util
 
 @pytest.fixture
 def bfuse(tmpdir):
@@ -15,5 +15,4 @@ def bfuse(tmpdir):
 
     yield bf
 
-    if bf.returncode is None:
-        bf.unmount(timeout=5.0)
+    bf.unmount(timeout=5.0)