Whitespace corrections

This commit is contained in:
Marius van Witzenburg
2021-02-02 21:01:13 +01:00
parent ab77b91d4e
commit 0fb0faccae
14 changed files with 66 additions and 82 deletions

View File

@ -4,7 +4,7 @@ import time
class TestZfsAutobackup(unittest2.TestCase):
def setUp(self):
prepare_zpools()
self.longMessage=True
@ -26,7 +26,7 @@ class TestZfsAutobackup(unittest2.TestCase):
self.assertFalse(ZfsAutobackup("test --verbose --allow-empty --keep-source 0".split(" ")).run())
#on source: only has 1 and 2 (1 was hold)
#on target: has 0 and 1
#on target: has 0 and 1
#XXX:
r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS)
self.assertMultiLineEqual(r,"""
@ -108,7 +108,7 @@ test_target1/test_source2/fs2/sub@test-20101111000000
with patch('time.strftime', return_value="20101111000001"):
self.assertFalse(ZfsAutobackup("test test_target1 --allow-empty".split(" ")).run())
r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS)
self.assertMultiLineEqual(r,"""
test_source1
@ -435,7 +435,7 @@ test_target1/fs2/sub@test-20101111000000
def test_clearrefres(self):
#on zfs utils 0.6.x -x isnt supported
#on zfs utils 0.6.x -x isnt supported
r=shelltest("zfs recv -x bla test >/dev/null </dev/zero; echo $?")
if r=="\n2\n":
self.skipTest("This zfs-userspace version doesnt support -x")
@ -474,7 +474,7 @@ test_target1/test_source2/fs2/sub@test-20101111000000 refreservation -
def test_clearmount(self):
#on zfs utils 0.6.x -o isnt supported
#on zfs utils 0.6.x -o isnt supported
r=shelltest("zfs recv -o bla=1 test >/dev/null </dev/zero; echo $?")
if r=="\n2\n":
self.skipTest("This zfs-userspace version doesnt support -o")
@ -703,7 +703,7 @@ test_target1/test_source2/fs2/sub@test-20101111000002
r=shelltest("zfs set compress=off test_source1")
r=shelltest("touch /test_source1/fs1/change.txt")
r=shelltest("zfs umount test_source1/fs1; zfs mount test_source1/fs1")
#too small change, takes no snapshots
with patch('time.strftime', return_value="20101111000001"):
@ -840,8 +840,5 @@ test_target1/test_source2/fs2/sub@test-20101111000000
# TODO:
def test_raw(self):
self.skipTest("todo: later when travis supports zfs 0.8")