diff --git a/test_zfsautobackup.py b/test_zfsautobackup.py index e6a3e4f..341fb23 100644 --- a/test_zfsautobackup.py +++ b/test_zfsautobackup.py @@ -328,11 +328,10 @@ test_target1/fs2/sub@test-20101111000000 def test_clearrefres(self): - #on zfs utils 0.6.x this isnt supported, skip for now: + #on zfs utils 0.6.x -x isnt supported but returns 0 somehow r=shelltest("zfs recv -x bla test &>/dev/null; echo $?") - print("###### xoptiontestresult:"+r) - if r=="\n2\n": - pass + if r=="\n0\n": + self.skipTest("This zfs-userspace version doesnt support -x") r=shelltest("zfs set refreservation=1M test_source1/fs1") @@ -368,10 +367,10 @@ test_target1/test_source2/fs2/sub@test-20101111000000 refreservation - def test_clearmount(self): - #on zfs utils 0.6.x this isnt supported, skip for now: - r=shelltest("zfs recv -o bla=1 test; echo $?") - if r=="\n2\n": - pass + #on zfs utils 0.6.x -o isnt supported but returns 0 somehow + r=shelltest("zfs recv -o bla=1 test &>/dev/null; echo $?") + if r=="\n0\n": + self.skipTest("This zfs-userspace version doesnt support -x") with patch('time.strftime', return_value="20101111000000"):