Using pytest [assertNotEqual]

dmitry-lipetsk · dmitry-lipetsk · commit 2252d60fd25c · 2025-02-24T00:04:19.000+03:00
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -234,7 +234,7 @@ def test_reload(self):
             # check new value
             cmm_new = node.execute('show client_min_messages')
             assert ('debug1' == cmm_new[0][0].lower())
-            self.assertNotEqual(cmm_old, cmm_new)
+            assert (cmm_old != cmm_new)
 
     def test_pg_ctl(self):
         with get_new_node() as node:
@@ -260,7 +260,7 @@ def test_status(self):
 
             node.start()
 
-            self.assertNotEqual(node.pid, 0)
+            assert (node.pid != 0)
             assert (node.status() == NodeStatus.Running)
 
             node.stop()
@@ -400,12 +400,12 @@ def test_backup_multiple(self):
 
             with node.backup(xlog_method='fetch') as backup1, \
                     node.backup(xlog_method='fetch') as backup2:
-                self.assertNotEqual(backup1.base_dir, backup2.base_dir)
+                assert (backup1.base_dir != backup2.base_dir)
 
             with node.backup(xlog_method='fetch') as backup:
                 with backup.spawn_primary('node1', destroy=False) as node1, \
                         backup.spawn_primary('node2', destroy=False) as node2:
-                    self.assertNotEqual(node1.base_dir, node2.base_dir)
+                    assert (node1.base_dir != node2.base_dir)
 
     def test_backup_exhaust(self):
         with get_new_node() as node:
@@ -818,12 +818,12 @@ def test_pg_config(self):
             c2 = get_pg_config()
 
             # check different instances after config change
-            self.assertNotEqual(id(c1), id(c2))
+            assert (id(c1) != id(c2))
 
             # check different instances
             a = get_pg_config()
             b = get_pg_config()
-            self.assertNotEqual(id(a), id(b))
+            assert (id(a) != id(b))
 
     def test_config_stack(self):
         # no such option
@@ -876,7 +876,7 @@ def test_auto_name(self):
                 assert (r.status())
 
                 # check their names
-                self.assertNotEqual(m.name, r.name)
+                assert (m.name != r.name)
                 assert ('testgres' in m.name)
                 assert ('testgres' in r.name)
 
@@ -1206,7 +1206,7 @@ def test_port_rereserve_during_node_start(self):
 
                     node2.init().start()
 
-                    self.assertNotEqual(node2.port, node1.port)
+                    assert (node2.port != node1.port)
                     assert (node2._should_free_port)
                     assert (__class__.tagPortManagerProxy.sm_DummyPortCurrentUsage == 0)
                     assert (__class__.tagPortManagerProxy.sm_DummyPortTotalUsage == C_COUNT_OF_BAD_PORT_USAGE)
diff --git a/tests/test_simple_remote.py b/tests/test_simple_remote.py
@@ -291,7 +291,7 @@ def test_reload(self):
             # check new value
             cmm_new = node.execute('show client_min_messages')
             assert ('debug1' == cmm_new[0][0].lower())
-            self.assertNotEqual(cmm_old, cmm_new)
+            assert (cmm_old != cmm_new)
 
     def test_pg_ctl(self):
         with get_remote_node(conn_params=conn_params) as node:
@@ -317,7 +317,7 @@ def test_status(self):
 
             node.start()
 
-            self.assertNotEqual(node.pid, 0)
+            assert (node.pid != 0)
             assert (node.status() == NodeStatus.Running)
 
             node.stop()
@@ -453,12 +453,12 @@ def test_backup_multiple(self):
 
             with node.backup(xlog_method='fetch') as backup1, \
                     node.backup(xlog_method='fetch') as backup2:
-                self.assertNotEqual(backup1.base_dir, backup2.base_dir)
+                assert (backup1.base_dir != backup2.base_dir)
 
             with node.backup(xlog_method='fetch') as backup:
                 with backup.spawn_primary('node1', destroy=False) as node1, \
                         backup.spawn_primary('node2', destroy=False) as node2:
-                    self.assertNotEqual(node1.base_dir, node2.base_dir)
+                    assert (node1.base_dir != node2.base_dir)
 
     def test_backup_exhaust(self):
         with get_remote_node(conn_params=conn_params) as node:
@@ -865,12 +865,12 @@ def test_pg_config(self):
             c2 = get_pg_config()
 
             # check different instances after config change
-            self.assertNotEqual(id(c1), id(c2))
+            assert (id(c1) != id(c2))
 
             # check different instances
             a = get_pg_config()
             b = get_pg_config()
-            self.assertNotEqual(id(a), id(b))
+            assert (id(a) != id(b))
 
     def test_config_stack(self):
         # no such option
@@ -927,7 +927,7 @@ def test_auto_name(self):
                 assert (r.status())
 
                 # check their names
-                self.assertNotEqual(m.name, r.name)
+                assert (m.name != r.name)
                 assert ('testgres' in m.name)
                 assert ('testgres' in r.name)
 
