mirror of
https://github.com/psy0rz/zfs_autobackup.git
synced 2025-06-03 01:30:57 +03:00
fix test skip
This commit is contained in:
parent
56a2f26dfa
commit
01425e735d
@ -328,11 +328,10 @@ test_target1/fs2/sub@test-20101111000000
|
|||||||
|
|
||||||
def test_clearrefres(self):
|
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 $?")
|
r=shelltest("zfs recv -x bla test &>/dev/null; echo $?")
|
||||||
print("###### xoptiontestresult:"+r)
|
if r=="\n0\n":
|
||||||
if r=="\n2\n":
|
self.skipTest("This zfs-userspace version doesnt support -x")
|
||||||
pass
|
|
||||||
|
|
||||||
r=shelltest("zfs set refreservation=1M test_source1/fs1")
|
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):
|
def test_clearmount(self):
|
||||||
|
|
||||||
#on zfs utils 0.6.x this isnt supported, skip for now:
|
#on zfs utils 0.6.x -o isnt supported but returns 0 somehow
|
||||||
r=shelltest("zfs recv -o bla=1 test; echo $?")
|
r=shelltest("zfs recv -o bla=1 test &>/dev/null; echo $?")
|
||||||
if r=="\n2\n":
|
if r=="\n0\n":
|
||||||
pass
|
self.skipTest("This zfs-userspace version doesnt support -x")
|
||||||
|
|
||||||
|
|
||||||
with patch('time.strftime', return_value="20101111000000"):
|
with patch('time.strftime', return_value="20101111000000"):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user