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

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

diff --git a/tests/test_basic.py b/tests/test_basic.py
index 9cd7b2f836fc9a2da439e5d35d096d0b78119a75..a2e95c5972d919bc8cd80ed231e0ad1f6ef2f3db 100644 (file)
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -3,7 +3,7 @@
 # Basic bcachefs functionality tests.
 
 import re
-import util
+from tests import util
 
 def test_help():
     ret = util.run_bch(valgrind=True)
@@ -21,8 +21,7 @@ def test_format(tmpdir):
     assert len(ret.stderr) == 0
 
 def test_fsck(tmpdir):
-    dev = util.device_1g(tmpdir)
-    util.run_bch('format', dev, valgrind=False, check=True)
+    dev = util.format_1g(tmpdir)
 
     ret = util.run_bch('fsck', dev, valgrind=True)
 
@@ -31,19 +30,16 @@ def test_fsck(tmpdir):
     assert len(ret.stderr) == 0
 
 def test_list(tmpdir):
-    dev = util.device_1g(tmpdir)
-    util.run_bch('format', dev, valgrind=False, check=True)
+    dev = util.format_1g(tmpdir)
 
     ret = util.run_bch('list', dev, valgrind=True)
 
     assert ret.returncode == 0
     assert len(ret.stderr) == 0
     assert "recovering from clean shutdown" in ret.stdout
-    assert len(ret.stdout.splitlines()) == 2
 
 def test_list_inodes(tmpdir):
-    dev = util.device_1g(tmpdir)
-    util.run_bch('format', dev, valgrind=False, check=True)
+    dev = util.format_1g(tmpdir)
 
     ret = util.run_bch('list', '-b', 'inodes', dev, valgrind=True)
 
@@ -52,8 +48,7 @@ def test_list_inodes(tmpdir):
     assert len(ret.stdout.splitlines()) == (2 + 2) # 2 inodes on clean format
 
 def test_list_dirent(tmpdir):
-    dev = util.device_1g(tmpdir)
-    util.run_bch('format', dev, valgrind=False, check=True)
+    dev = util.format_1g(tmpdir)
 
     ret = util.run_bch('list', '-b', 'dirents', dev, valgrind=True)