patrick/zfs_autobackup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show pipes in verbose

Browse Source
This commit is contained in:
Edwin Eefting
2021-05-15 12:34:21 +02:00
parent 59d53e9664
commit 5e04aabf37
5 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/test_sendrecvpipes.py
View File

@ -14,20 +14,13 @@ class TestSendRecvPipes(unittest2.TestCase):
"""send basics (remote/local send pipe)"""
with patch('time.strftime', return_value="20101111000000"):
self.assertFalse(ZfsAutobackup(["test", "test_target1", "--no-progress", "--send-pipe=dd bs=1M", "--send-pipe=dd bs=2M"]).run())
self.assertFalse(ZfsAutobackup(["test", "test_target1", "--no-progress", "--send-pipe=dd bs=1M", "--recv-pipe=dd bs=2M"]).run())
with patch('time.strftime', return_value="20101111000001"):
self.assertFalse(ZfsAutobackup(["test", "test_target1", "--no-progress", "--ssh-source=localhost", "--send-pipe=dd bs=1M", "--send-pipe=dd bs=2M"]).run())
self.assertFalse(ZfsAutobackup(["test", "test_target1", "--no-progress", "--ssh-source=localhost", "--send-pipe=dd bs=1M", "--recv-pipe=dd bs=2M"]).run())
# r=shelltest("zfs list -H -o name -r -t snapshot test_target1")
# #NOTE: it wont backup test_target1/a/test_source2/fs2/sub to test_target1/b since it doesnt have the zfs_autobackup property anymore.
# self.assertMultiLineEqual(r,"""
# test_target1/a/test_source1/fs1@test-20101111000000
# test_target1/a/test_source1/fs1/sub@test-20101111000000
# test_target1/a/test_source2/fs2/sub@test-20101111000000
# test_target1/b/test_source1/fs1@test-20101111000000
# test_target1/b/test_source1/fs1/sub@test-20101111000000
# test_target1/b/test_source2/fs2/sub@test-20101111000000
# test_target1/b/test_target1/a/test_source1/fs1@test-20101111000000
# test_target1/b/test_target1/a/test_source1/fs1/sub@test-20101111000000
# """)
with patch('time.strftime', return_value="20101111000001"):
self.assertFalse(ZfsAutobackup(["test", "test_target1", "--no-progress", "--ssh-target=localhost", "--send-pipe=dd bs=1M", "--recv-pipe=dd bs=2M"]).run())
with patch('time.strftime', return_value="20101111000001"):
self.assertFalse(ZfsAutobackup(["test", "test_target1", "--no-progress", "--ssh-source=localhost", "--ssh-target=localhost", "--send-pipe=dd bs=1M", "--recv-pipe=dd bs=2M"]).run())

2
tests/test_zfsautobackup.py
View File

@ -890,7 +890,7 @@ test_target1/test_source2/fs2/sub@test-20101111000003
n=ZfsNode("test",l)
d=ZfsDataset(n,"test_source1@test")
sp=d.send_pipe([], prev_snapshot=None, resume_token=None, show_progress=True, raw=False, output_pipes=[], send_properties=True, write_embedded=True)
sp=d.send_pipe([], prev_snapshot=None, resume_token=None, show_progress=True, raw=False, send_pipes=[], send_properties=True, write_embedded=True)
with OutputIO() as buf: