Cleanup

Author: dmitry-lipetsk

tests/test_simple.py

@@ -144,8 +144,6 @@ def test_init_after_cleanup(self):
             node.cleanup()
             node.init().start().execute('select 1')
 
-    # @unittest.skipUnless(util_exists('pg_resetwal.exe' if os.name == 'nt' else 'pg_resetwal'), 'pgbench might be missing')
-    # @unittest.skipUnless(pg_version_ge('9.6'), 'requires 9.6+')
     def test_init_unique_system_id(self):
         # this function exists in PostgreSQL 9.6+
         __class__.helper__skip_test_if_util_not_exist("pg_resetwal")
@@ -456,7 +454,6 @@ def test_replicate(self):
                 res = node.execute('select * from test')
                 assert (res == [])
 
-    # @unittest.skipUnless(pg_version_ge('9.6'), 'requires 9.6+')
     def test_synchronous_replication(self):
         __class__.helper__skip_test_if_pg_version_is_not_ge("9.6")
 
@@ -499,7 +496,6 @@ def test_synchronous_replication(self):
                     res = standby1.safe_psql('select count(*) from abc')
                     assert (rm_carriage_returns(res) == b'1000000\n')
 
-    # @unittest.skipUnless(pg_version_ge('10'), 'requires 10+')
     def test_logical_replication(self):
         __class__.helper__skip_test_if_pg_version_is_not_ge("10")
 
@@ -570,7 +566,6 @@ def test_logical_replication(self):
             res = node2.execute('select * from test2')
             assert (res == [('a', ), ('b', )])
 
-    # @unittest.skipUnless(pg_version_ge('10'), 'requires 10+')
     def test_logical_catchup(self):
         """ Runs catchup for 100 times to be sure that it is consistent """
         __class__.helper__skip_test_if_pg_version_is_not_ge("10")
@@ -595,7 +590,6 @@ def test_logical_catchup(self):
                 assert (res == [(i, i, )])
                 node1.execute('delete from test')
 
-    # @unittest.skipIf(pg_version_ge('10'), 'requires <10')
     def test_logical_replication_fail(self):
         __class__.helper__skip_test_if_pg_version_is_ge("10")
 
@@ -774,7 +768,6 @@ def test_logging(self):
                 master.restart()
                 assert (master._logger.is_alive())
 
-    # @unittest.skipUnless(util_exists('pgbench.exe' if os.name == 'nt' else 'pgbench'), 'pgbench might be missing')
     def test_pgbench(self):
         __class__.helper__skip_test_if_util_not_exist("pgbench")
 

tests/test_simple_remote.py

@@ -217,8 +217,6 @@ def test_init_after_cleanup(self):
             node.cleanup()
             node.init().start().execute('select 1')
 
-    # @unittest.skipUnless(util_exists('pg_resetwal'), 'might be missing')
-    # @unittest.skipUnless(pg_version_ge('9.6'), 'requires 9.6+')
     def test_init_unique_system_id(self):
         # this function exists in PostgreSQL 9.6+
         __class__.helper__skip_test_if_util_not_exist("pg_resetwal")
@@ -522,7 +520,6 @@ def test_replicate(self):
                 res = node.execute('select * from test')
                 assert (res == [])
 
-    # @unittest.skipUnless(pg_version_ge('9.6'), 'requires 9.6+')
     def test_synchronous_replication(self):
         __class__.helper__skip_test_if_pg_version_is_not_ge("9.6")
 
@@ -565,7 +562,6 @@ def test_synchronous_replication(self):
                     res = standby1.safe_psql('select count(*) from abc')
                     assert (res == b'1000000\n')
 
-    # @unittest.skipUnless(pg_version_ge('10'), 'requires 10+')
     def test_logical_replication(self):
         __class__.helper__skip_test_if_pg_version_is_not_ge("10")
 
@@ -636,7 +632,6 @@ def test_logical_replication(self):
             res = node2.execute('select * from test2')
             assert (res == [('a',), ('b',)])
 
-    # @unittest.skipUnless(pg_version_ge('10'), 'requires 10+')
     def test_logical_catchup(self):
         """ Runs catchup for 100 times to be sure that it is consistent """
         __class__.helper__skip_test_if_pg_version_is_not_ge("10")
@@ -661,7 +656,6 @@ def test_logical_catchup(self):
                 assert (res == [(i, i, )])
                 node1.execute('delete from test')
 
-    # @unittest.skipIf(pg_version_ge('10'), 'requires <10')
     def test_logical_replication_fail(self):
         __class__.helper__skip_test_if_pg_version_is_ge("10")
 
@@ -840,7 +834,6 @@ def test_logging(self):
                 master.restart()
                 assert (master._logger.is_alive())
 
-    # @unittest.skipUnless(util_exists('pgbench'), 'might be missing')
     def test_pgbench(self):
         __class__.helper__skip_test_if_util_not_exist("pgbench")