From 686bb48bdaf62e37428ff3960fa8b5c0f52f0c25 Mon Sep 17 00:00:00 2001 From: Edwin Eefting Date: Thu, 11 Mar 2021 11:57:51 +0100 Subject: [PATCH] restore progres. verify --destroy-incompabible output. --- tests/test_zfsautobackup.py | 24 ++++++++++++++++++++++++ zfs_autobackup/ZfsDataset.py | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/tests/test_zfsautobackup.py b/tests/test_zfsautobackup.py index 362d9cb..3314c40 100644 --- a/tests/test_zfsautobackup.py +++ b/tests/test_zfsautobackup.py @@ -541,6 +541,30 @@ test_target1/test_source2/fs2/sub@test-20101111000000 canmount - - #should succeed by destroying incompatibles self.assertFalse(ZfsAutobackup("test test_target1 --verbose --allow-empty --destroy-incompatible".split(" ")).run()) + r = shelltest("zfs list -H -o name -r -t all test_target1") + self.assertMultiLineEqual(r, """ +test_target1 +test_target1/test_source1 +test_target1/test_source1/fs1 +test_target1/test_source1/fs1@test-20101111000000 +test_target1/test_source1/fs1@compatible1 +test_target1/test_source1/fs1@compatible2 +test_target1/test_source1/fs1@test-20101111000001 +test_target1/test_source1/fs1@test-20101111000002 +test_target1/test_source1/fs1@test-20101111000003 +test_target1/test_source1/fs1/sub +test_target1/test_source1/fs1/sub@test-20101111000000 +test_target1/test_source1/fs1/sub@test-20101111000001 +test_target1/test_source1/fs1/sub@test-20101111000002 +test_target1/test_source1/fs1/sub@test-20101111000003 +test_target1/test_source2 +test_target1/test_source2/fs2 +test_target1/test_source2/fs2/sub +test_target1/test_source2/fs2/sub@test-20101111000000 +test_target1/test_source2/fs2/sub@test-20101111000001 +test_target1/test_source2/fs2/sub@test-20101111000002 +test_target1/test_source2/fs2/sub@test-20101111000003 +""") diff --git a/zfs_autobackup/ZfsDataset.py b/zfs_autobackup/ZfsDataset.py index e0015fc..d43b509 100644 --- a/zfs_autobackup/ZfsDataset.py +++ b/zfs_autobackup/ZfsDataset.py @@ -413,7 +413,7 @@ class ZfsDataset: # progress output if show_progress: - # cmd.append("-v") + cmd.append("-v") cmd.append("-P") # resume a previous send? (don't need more parameters in that case)