More Testing. Tweaked To Support Python 2.7.18

Author: JavaScriptDude

examples/ex_local.py

@@ -1,4 +1,6 @@
 # Basic example for accessing ZFS on local machine
+# Test requirements:
+# python-magic
 import sys
 import zfslib as zfs
 from zfslib_ex_common import *
@@ -43,5 +45,7 @@ def main(argv):
 
 if __name__ == '__main__':
     main(sys.argv[1:])
+    sys.exit(0)
+
 
 

examples/ex_other.py

@@ -1,4 +1,6 @@
 # See: https://github.com/JavaScriptDude/zfslib
+# Test requirements:
+# python-magic
 
 import sys, magic, subprocess
 from datetime import datetime, timedelta
@@ -65,10 +67,9 @@ def main(argv):
         c = snapshots[-1:][0].pool.connection
 
 
-    ds_name_full = f"{pool_name}/{ds_name}"
 
     # Print datasets creation date
-    print(f"{ds_name_full} creation date: {ds.creation}")
+    print("{} creation date: {}".format(ds.path, ds.creation))
 
     # Grab Snapshots
     snapshots = ds.get_snapshots()
@@ -77,14 +78,14 @@ def main(argv):
         snap=snapshots[0]
 
         # Get Snapshot Creation date
-        print(f"{ds_name_full}@{snap.name} creation date: {ds.creation}")
+        print("{} creation date: {}".format(snap.path, snap.creation))
 
         # Read property from DataSet / Snapshot
-        print(f"{ds_name_full}@{snap.name} usedsnap: {snap.get_property('usedsnap')}")
-
+        print("{} usedsnap: {}".format(snap.path, snap.get_property('usedsnap')))
 
 
 if __name__ == '__main__':
     main(sys.argv[1:])
+    sys.exit(0)
 
 

examples/ex_remote.py

@@ -1,5 +1,6 @@
 # Basic example for accessing ZFS on remote machine
-
+# Test requirements:
+# python-magic
 import sys
 import zfslib as zfs
 from zfslib_ex_common import *
@@ -56,5 +57,6 @@ def main(argv):
 
 if __name__ == '__main__':
     main(sys.argv[1:])
+    sys.exit(0)
 
 

examples/zfslib_ex_common.py

@@ -1,23 +1,26 @@
+
+# Test requirements:
+# python-magic
 import sys, magic, subprocess
 import zfslib as zfs
 
 from datetime import datetime, timedelta
 
-def print_all_datasets(pool: zfs.Pool):
+def print_all_datasets(pool):
     allds = pool.get_all_datasets(with_depth=True)
     for (depth, ds) in allds:
         print("{}: {} {} ({})".format(pool.name, ' .'*depth, ds.name, ds.dspath))
 
 
 
-def print_all_datasets(pool: zfs.Pool):
+def print_all_datasets(pool):
     allds = pool.get_all_datasets(with_depth=True)
     for (depth, ds) in allds:
         print("{}: {} {} ({})".format(pool.name, ' .'*depth, ds.name, ds.dspath))
 
 
 # This can be very slow for large datasets. Its actually `zfs diff` thats the slow part
-def print_diffs_test(ds: zfs.Dataset, snapshots: list):
+def print_diffs_test(ds, snapshots):
     snap_last = None
     for i, snap in enumerate(snapshots):
 
@@ -48,7 +51,7 @@ def print_diffs_test(ds: zfs.Dataset, snapshots: list):
 
 
 
-def get_file_diff(diff:zfs.Diff):
+def get_file_diff(diff):
     if not diff.file_type == 'F':
         raise Exception('get_file_diff() is only available for files (file_type = F).')
     if not diff.chg_type == 'M':

tests/test_sync.py

@@ -3,7 +3,7 @@
 
 @author: rudd-o
 '''
-import unittest
+import unittest2
 import zfslib as zfs
 from zfslib_test_tools import *
 import sync
@@ -15,7 +15,7 @@ def x(string):
     )
 
 
-class TestRecursiveReplicate(unittest.TestCase):
+class TestRecursiveReplicate(unittest2.TestCase):
 
     maxDiff = None
 
@@ -1075,7 +1075,7 @@ def test_replicates_complex_datasets(self):
         self.assertEqual(expected_coalesced_recursivized,real_coalesced_recursivized)
 
 
-class TestRecursiveClearObsolete(unittest.TestCase):
+class TestRecursiveClearObsolete(unittest2.TestCase):
 
     maxDiff = None
 
@@ -1270,4 +1270,5 @@ def test_destroys_all_datasets_recursively(self):
 
 if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.testName']
-    unittest.main()
+    unittest2.main()
+    sys.exit(0)

tests/test_zfslib.py

@@ -1,4 +1,4 @@
-import unittest
+import unittest2
 from datetime import datetime, timedelta, date as dt_date
 import zfslib as zfs
 from zfslib_test_tools import *
@@ -20,7 +20,7 @@
 ps_nm = TestPoolSet()
 ps_nm.parse_zfs_r_output(zlist_data_nm, properties=props_nm)
 
-class PoolSetTests(unittest.TestCase):
+class PoolSetTests(unittest2.TestCase):
 
 
     def test_pool_names(self):
@@ -480,7 +480,7 @@ def test_splitPath(self):
 
 
 
-class Simplify_Tests(unittest.TestCase):
+class Simplify_Tests(unittest2.TestCase):
 
     def test_simple(self):
         m = [
@@ -527,7 +527,7 @@ def test_with_strings(self):
         self.assertEqual(r1, r2)        
 
 
-class Uniq_Tests(unittest.TestCase):
+class Uniq_Tests(unittest2.TestCase):
 
     def test_identity(self):
         s = "abc"
@@ -557,4 +557,5 @@ def test_idfun(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest2.main()
+    sys.exit(0)

tests/test_zfslib_online.py

@@ -1,4 +1,4 @@
-import unittest
+import unittest2
 from datetime import datetime, timedelta, date as dt_date
 import zfslib as zfs
 from zfslib_test_tools import *
@@ -52,7 +52,7 @@ def _checkPath(path):
     if b_cr: _checkPath(diff.snap_path_right)
 
 
-class Diff_Tests(unittest.TestCase):
+class Diff_Tests(unittest2.TestCase):
     def setUp(self):
         if len(snaps_varlog) < 2:
             raise Exception("Testing cannot be done. Please ensure that Dataset rpool/ROOT/<computer>/var/log has more than one snapshot")
@@ -159,7 +159,7 @@ def _verify_diffs(self, step, diffs):
 
 
 
-class Poolset_Tests(unittest.TestCase):
+class Poolset_Tests(unittest2.TestCase):
     def test_find_dataset_for_path(self):
         path = '/var/log/apt/history.log'
         tup = poolset.find_dataset_for_path(path)
@@ -200,7 +200,7 @@ def test_find_dataset_for_path(self):
 
 
 
-class Dataset_Tests(unittest.TestCase):
+class Dataset_Tests(unittest2.TestCase):
 
     def test_get_rel_path(self):
         self.assertEqual(ds_varlog.get_rel_path('/var/log/apt/history.log'), '/apt/history.log')
@@ -212,7 +212,7 @@ def test_get_rel_path(self):
 
 
 
-class Snapshot_Tests(unittest.TestCase):
+class Snapshot_Tests(unittest2.TestCase):
 
     def test_resolve_snap_path(self):
         snap = snaps_varlog[1]
@@ -240,4 +240,5 @@ def test_resolve_snap_path(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest2.main()
+    sys.exit(0)

tests/zfslib_test_tools.py

@@ -4,7 +4,6 @@
 from datetime import datetime
 import zfslib as zfs
 
-
 def dt_from_creation(creation):
     return datetime.fromtimestamp(int(creation))