systemtest: fix python list test

bareos · Apr 5, 2022 · 59c4a59 · 59c4a59
1 parent 552914f
commit 59c4a59
Showing 1 changed file with 38 additions and 14 deletions.
diff --git a/systemtests/tests/python-bareos/test_list_command.py b/systemtests/tests/python-bareos/test_list_command.py
@@ -76,9 +76,12 @@ def test_list_jobs(self):
             "jobbytes",
             "jobstatus",
         ]
+        resultkeys = list(result["jobs"][0].keys())
+        resultkeys.sort()
+        expected_list_keys.sort()
         self.assertEqual(
-            list(result["jobs"][0].keys()).sort(),
-            expected_list_keys.sort(),
+            resultkeys,
+            expected_list_keys,
         )
         reg = re.compile("..:..:..")
         self.assertTrue(re.match(reg, result["jobs"][0]["duration"]))
@@ -114,9 +117,13 @@ def test_list_jobs(self):
             "filesetid",
             "fileset",
         ]
+        resultkeys = list(result["jobs"][0].keys())
+
+        resultkeys.sort()
+        expected_long_list_keys.sort()
         self.assertEqual(
-            list(result["jobs"][0].keys()).sort(),
-            expected_long_list_keys.sort(),
+            resultkeys,
+            expected_long_list_keys,
         )
 
         # Long list with options
@@ -167,9 +174,13 @@ def test_list_jobs(self):
             "filesetid",
             "fileset",
         ]
+        resultkeys = list(result["jobs"][0].keys())
+
+        resultkeys.sort()
+        expected_long_list_last_keys.sort()
         self.assertEqual(
-            list(result["jobs"][0].keys()).sort(),
-            expected_long_list_last_keys.sort(),
+            resultkeys,
+            expected_long_list_last_keys,
         )
 
         result = director.call("llist jobs last current")
@@ -272,9 +283,13 @@ def test_list_media(self):
             "lastwritten",
             "storage",
         ]
+        resultkeys = list(result["volumes"]["full"][0].keys())
+
+        resultkeys.sort()
+        expected_list_media_keys.sort()
         self.assertEqual(
-            list(result["volumes"]["full"][0].keys()).sort(),
-            expected_list_media_keys.sort(),
+            resultkeys,
+            expected_list_media_keys,
         )
 
         # check expected behavior when asking for specific volume by name
@@ -338,17 +353,22 @@ def test_list_pool(self):
         director.call("wait")
 
         result = director.call("list pool")
-        expected_list_media_keys = [
+        expected_list_pool_keys = [
             "poolid",
             "name",
             "numvols",
             "maxvols",
             "pooltype",
             "labelformat",
         ]
+
+        resultkeys = list(result["pools"][0].keys())
+
+        resultkeys.sort()
+        expected_list_pool_keys.sort()
         self.assertEqual(
-            list(result["pools"][0].keys()).sort(),
-            expected_list_media_keys.sort(),
+            resultkeys,
+            expected_list_pool_keys,
         )
 
         # check expected behavior when asking for specific volume by name
@@ -359,7 +379,7 @@ def test_list_pool(self):
         )
 
         result = director.call("llist pool")
-        expected_list_media_keys = [
+        expected_long_list_pool_keys = [
             "poolid",
             "name",
             "numvols",
@@ -380,9 +400,13 @@ def test_list_pool(self):
             "recyclepoolid",
             "labeltype",
         ]
+        resultkeys = list(result["pools"][0].keys())
+
+        resultkeys.sort()
+        expected_long_list_pool_keys.sort()
         self.assertEqual(
-            list(result["pools"][0].keys()).sort(),
-            expected_list_media_keys.sort(),
+            resultkeys,
+            expected_long_list_pool_keys,
         )
 
         # check expected behavior when asking for specific volume by name