Using pytest [assertIsNotNone]

dmitry-lipetsk · dmitry-lipetsk · commit 12d702ad7e65 · 2025-02-23T23:29:44.000+03:00
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -111,7 +111,7 @@ class TestgresTests(unittest.TestCase):
     def test_node_repr(self):
         with get_new_node() as node:
             pattern = r"PostgresNode\(name='.+', port=.+, base_dir='.+'\)"
-            self.assertIsNotNone(re.match(pattern, str(node)))
+            assert re.match(pattern, str(node)) is not None
 
     def test_custom_init(self):
         with get_new_node() as node:
@@ -370,7 +370,7 @@ def test_control_data(self):
             data = node.get_control_data()
 
             # check returned dict
-            self.assertIsNotNone(data)
+            assert data is not None
             self.assertTrue(any('pg_control' in s for s in data.keys()))
 
     def test_backup_simple(self):
diff --git a/tests/test_simple_remote.py b/tests/test_simple_remote.py
@@ -99,7 +99,7 @@ class TestgresRemoteTests(unittest.TestCase):
     def test_node_repr(self):
         with get_remote_node(conn_params=conn_params) as node:
             pattern = r"PostgresNode\(name='.+', port=.+, base_dir='.+'\)"
-            self.assertIsNotNone(re.match(pattern, str(node)))
+            assert re.match(pattern, str(node)) is not None
 
     def test_custom_init(self):
         with get_remote_node(conn_params=conn_params) as node:
@@ -424,7 +424,7 @@ def test_control_data(self):
             data = node.get_control_data()
 
             # check returned dict
-            self.assertIsNotNone(data)
+            assert data is not None
             self.assertTrue(any('pg_control' in s for s in data.keys()))
 
     def test_backup_simple(self):
@@ -1084,6 +1084,7 @@ def test_child_process_dies(self):
             # try to handle children list -- missing processes will have ptype "ProcessType.Unknown"
             [ProcessProxy(p) for p in children]
 
+    @staticmethod
     def helper__restore_envvar(name, prev_value):
         if prev_value is None:
             os.environ.pop(name, None)
