From 915a29b36e501eff82d7a5cf20165982408e1f87 Mon Sep 17 00:00:00 2001 From: Edwin Eefting Date: Thu, 25 Jun 2020 17:15:18 +0200 Subject: [PATCH] tests: make sure it doest get confused by other zfs datasets --- basetest.py | 3 +-- run_tests | 2 +- test_zfsautobackup.py | 24 ++++++++++++------------ test_zfsnode.py | 6 +++--- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/basetest.py b/basetest.py index 13f3274..10a954f 100644 --- a/basetest.py +++ b/basetest.py @@ -11,7 +11,7 @@ from pprint import * from bin.zfs_autobackup import * from mock import * - +TEST_POOLS="test_source1 test_source2 test_target1" def shelltest(cmd): @@ -27,7 +27,6 @@ def prepare_zpools(): print("Preparing zfs filesystems...") #need ram blockdevice - # subprocess.call("rmmod brd", shell=True) subprocess.check_call("modprobe brd rd_size=512000", shell=True) #remove old stuff diff --git a/run_tests b/run_tests index 7fdb0ea..09605ee 100755 --- a/run_tests +++ b/run_tests @@ -24,7 +24,7 @@ if ! [ -e /root/.ssh/id_rsa ]; then ssh -oStrictHostKeyChecking=no localhost true || exit 1 fi -coverage run --source bin.zfs_autobackup -m unittest discover -v +coverage run --source bin.zfs_autobackup -m unittest discover -v $@ EXIT=$? echo diff --git a/test_zfsautobackup.py b/test_zfsautobackup.py index 3c26130..ea0d564 100644 --- a/test_zfsautobackup.py +++ b/test_zfsautobackup.py @@ -16,7 +16,7 @@ class TestZfsAutobackup(unittest2.TestCase): with patch('time.strftime', return_value="20101111000000"): self.assertFalse(ZfsAutobackup("test test_target1 --verbose --debug".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 @@ -46,7 +46,7 @@ test_target1/test_source2/fs2/sub@test-20101111000000 self.assertFalse(ZfsAutobackup("test test_target1 --allow-empty".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 @@ -122,7 +122,7 @@ test_target1/test_source2/fs2/sub@test-20101111000001 userrefs 1 - with patch('time.strftime', return_value="20101111000000"): self.assertFalse(ZfsAutobackup("test test_target1 --verbose".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 @@ -157,7 +157,7 @@ test_target1/test_source2/fs2/sub@test-20101111000000 with patch('time.strftime', return_value="20101111000000"): self.assertFalse(ZfsAutobackup("test test_target1 --verbose --other-snapshots".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 @@ -192,7 +192,7 @@ test_target1/test_source2/fs2/sub@test-20101111000000 with patch('time.strftime', return_value="20101111000000"): self.assertFalse(ZfsAutobackup("test test_target1 --verbose --no-snapshot".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) #(only parents are created ) #TODO: it probably shouldn't create these self.assertMultiLineEqual(r,""" @@ -216,7 +216,7 @@ test_target1/test_source2/fs2 with patch('time.strftime', return_value="20101111000000"): self.assertFalse(ZfsAutobackup("test test_target1 --verbose --no-send".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) #(only parents are created ) #TODO: it probably shouldn't create these self.assertMultiLineEqual(r,""" @@ -241,7 +241,7 @@ test_target1 with patch('time.strftime', return_value="20101111000000"): self.assertFalse(ZfsAutobackup("test test_target1 --verbose --ignore-replicated".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) #(only parents are created ) #TODO: it probably shouldn't create these self.assertMultiLineEqual(r,""" @@ -304,7 +304,7 @@ test_target1/test_source2/fs2/sub@test-20101111000000 userrefs 1 - with patch('time.strftime', return_value="20101111000000"): self.assertFalse(ZfsAutobackup("test test_target1 --verbose --strip-path=1".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 @@ -465,7 +465,7 @@ test_target1/test_source2/fs2/sub@test-20101111000000 canmount - - self.assertFalse(ZfsAutobackup("test test_target1 --verbose --allow-empty".split(" ")).run()) #should still have all snapshots - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 @@ -502,7 +502,7 @@ test_target1/test_source2/fs2/sub@test-20101111000001 self.assertFalse(ZfsAutobackup("test test_target1 --verbose --allow-empty --keep-source=0 --keep-target=0".split(" ")).run()) #should only have last snapshots - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 @@ -542,7 +542,7 @@ test_target1/test_source2/fs2/sub@test-20101111000002 self.assertFalse(ZfsAutobackup("test test_target1 --verbose --allow-empty --ssh-source localhost --ssh-target localhost".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 @@ -604,7 +604,7 @@ test_target1/test_source2/fs2/sub@test-20101111000002 with patch('time.strftime', return_value="20101111000002"): self.assertFalse(ZfsAutobackup("test test_target1 --verbose --min-change 100000".split(" ")).run()) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertMultiLineEqual(r,""" test_source1 test_source1/fs1 diff --git a/test_zfsnode.py b/test_zfsnode.py index bd3b9b3..a55464e 100644 --- a/test_zfsnode.py +++ b/test_zfsnode.py @@ -15,7 +15,7 @@ class TestZfsNode(unittest2.TestCase): with self.subTest("first snapshot"): node.consistent_snapshot(node.selected_datasets, "test-1",100000) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertEqual(r,""" test_source1 test_source1/fs1 @@ -34,7 +34,7 @@ test_target1 with self.subTest("second snapshot, no changes, no snapshot"): node.consistent_snapshot(node.selected_datasets, "test-2",1) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertEqual(r,""" test_source1 test_source1/fs1 @@ -52,7 +52,7 @@ test_target1 with self.subTest("second snapshot, no changes, empty snapshot"): node.consistent_snapshot(node.selected_datasets, "test-2",0) - r=shelltest("zfs list -H -o name -r -t all") + r=shelltest("zfs list -H -o name -r -t all "+TEST_POOLS) self.assertEqual(r,""" test_source1 test_source1/fs1