third-party-mirrors/zfs_autobackup
1
0
Fork 1
mirror of https://github.com/psy0rz/zfs_autobackup.git synced 2025-04-13 22:47:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Edwin Eefting 2022-02-22 19:52:16 +01:00
parent 82ad7c2480
commit 8276d07feb
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/test_check.py
View File

@ -96,18 +96,31 @@ dir/testfile 0 2e863f1fcccd6642e4e28453eba10d2d3f74d798
self.assertEqual("Chunk 0 failed: 3c0bf91170d873b8e327d3bafb6bc074580d11bX 3c0bf91170d873b8e327d3bafb6bc074580d11b7\n", buf.getvalue()) self.assertEqual("Chunk 0 failed: 3c0bf91170d873b8e327d3bafb6bc074580d11bX 3c0bf91170d873b8e327d3bafb6bc074580d11b7\n", buf.getvalue())
def test_tree(self): def test_tree(self):
shelltest("rm -rf /tmp/testtree; mkdir /tmp/testtree")
shelltest("cp tests/data/whole /tmp/testtree")
shelltest("cp tests/data/whole_whole2 /tmp/testtree")
shelltest("cp tests/data/whole2 /tmp/testtree")
shelltest("cp tests/data/partial /tmp/testtree")
shelltest("cp tests/data/whole_whole2_partial /tmp/testtree")
with self.subTest("Generate"): with self.subTest("Generate"):
with OutputIO() as buf: with OutputIO() as buf:
with redirect_stdout(buf): with redirect_stdout(buf):
self.assertFalse(ZfsCheck("tests/data".split(" "), print_arguments=False).run()) self.assertFalse(ZfsCheck("/tmp/testtree".split(" "), print_arguments=False).run())
print(buf.getvalue()) #file order on disk can vary, so sort it..
self.assertEqual("""whole 0 3c0bf91170d873b8e327d3bafb6bc074580d11b7 sorted=buf.getvalue().split("\n")
whole_whole2 0 959e6b58078f0cfd2fb3d37e978fda51820473ff sorted.sort()
whole2 0 2e863f1fcccd6642e4e28453eba10d2d3f74d798 sorted="\n".join(sorted)+"\n"
print(sorted)
self.assertEqual("""
partial 0 642027d63bb0afd7e0ba197f2c66ad03e3d70de1 partial 0 642027d63bb0afd7e0ba197f2c66ad03e3d70de1
whole 0 3c0bf91170d873b8e327d3bafb6bc074580d11b7
whole2 0 2e863f1fcccd6642e4e28453eba10d2d3f74d798
whole_whole2 0 959e6b58078f0cfd2fb3d37e978fda51820473ff
whole_whole2_partial 0 309ffffba2e1977d12f3b7469971f30d28b94bd8 whole_whole2_partial 0 309ffffba2e1977d12f3b7469971f30d28b94bd8
""", buf.getvalue()) """, sorted)
# store on disk for next step, add error # store on disk for next step, add error
with open("/tmp/testhashes", "w") as fh: with open("/tmp/testhashes", "w") as fh:
@ -116,7 +129,7 @@ whole_whole2_partial 0 309ffffba2e1977d12f3b7469971f30d28b94bd8
with self.subTest("Compare"): with self.subTest("Compare"):
with OutputIO() as buf: with OutputIO() as buf:
with redirect_stdout(buf): with redirect_stdout(buf):
self.assertEqual(1, ZfsCheck("tests/data --check=/tmp/testhashes".split(" "), self.assertEqual(1, ZfsCheck("/tmp/testtree --check=/tmp/testhashes".split(" "),
print_arguments=False).run()) print_arguments=False).run())
print(buf.getvalue()) print(buf.getvalue())
self.assertEqual( self.assertEqual(

2
zfs_autobackup/ZfsCheck.py
View File

@ -227,8 +227,6 @@ class ZfsCheck(CliBase):
if self.args.check==None: if self.args.check==None:
for i in self.generate(input_generator=None): for i in self.generate(input_generator=None):
self.clear_progress()
if len(i)==3: if len(i)==3:
print("{}\t{}\t{}".format(*i)) print("{}\t{}\t{}".format(*i))
else: else: