From b7bd831b8d9c45b7b555bd2d2033125d033987f0 Mon Sep 17 00:00:00 2001
From: Yura Sokolov <funny.falcon@gmail.com>
Date: Tue, 15 Nov 2022 11:23:49 +0300
Subject: [PATCH] correctly test skips

---
 tests/archive.py          | 22 +++++++++++-----------
 tests/backup.py           |  8 ++++----
 tests/catchup.py          | 14 +++++++-------
 tests/compatibility.py    |  2 +-
 tests/delete.py           |  2 +-
 tests/external.py         |  6 +++---
 tests/false_positive.py   |  2 +-
 tests/helpers/__init__.py |  9 ++++++++-
 tests/incr_restore.py     |  4 ++--
 tests/merge.py            |  2 +-
 tests/option.py           |  2 +-
 tests/ptrack.py           |  2 +-
 tests/replica.py          | 34 +++++++++++++++++-----------------
 tests/restore.py          | 18 +++++++++---------
 tests/retention.py        |  4 ++--
 tests/time_consuming.py   |  4 ++--
 16 files changed, 71 insertions(+), 64 deletions(-)

diff --git a/tests/archive.py b/tests/archive.py
index 81d013f6b..a65b85dba 100644
--- a/tests/archive.py
+++ b/tests/archive.py
@@ -86,7 +86,7 @@ def test_pgpro434_2(self):
 
         if self.get_version(node) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because pg_control_checkpoint() is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -717,7 +717,7 @@ def test_replica_archive(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -848,7 +848,7 @@ def test_master_and_replica_parallel_archiving(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         replica = self.make_simple_node(
@@ -929,7 +929,7 @@ def test_basic_master_and_replica_concurrent_archiving(self):
             make sure that archiving on both node is working.
         """
         if self.pg_config_version < self.version_to_num('9.6.0'):
-            return unittest.skip('You need PostgreSQL >= 9.6 for this test')
+            self.skipTest('You need PostgreSQL >= 9.6 for this test')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -943,7 +943,7 @@ def test_basic_master_and_replica_concurrent_archiving(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         replica = self.make_simple_node(
@@ -1035,7 +1035,7 @@ def test_concurrent_archiving(self):
         """
 
         if self.pg_config_version < self.version_to_num('11.0'):
-            return unittest.skip('You need PostgreSQL >= 11 for this test')
+            self.skipTest('You need PostgreSQL >= 11 for this test')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1196,7 +1196,7 @@ def test_archive_pg_receivexlog_compression_pg10(self):
         self.add_instance(backup_dir, 'node', node)
         node.slow_start()
         if self.get_version(node) < self.version_to_num('10.0'):
-            return unittest.skip('You need PostgreSQL >= 10 for this test')
+            self.skipTest('You need PostgreSQL >= 10 for this test')
         else:
             pg_receivexlog_path = self.get_bin_path('pg_receivewal')
 
@@ -1278,7 +1278,7 @@ def test_archive_catalog(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -1938,7 +1938,7 @@ def test_waldir_outside_pgdata_archiving(self):
         check that archive-push works correct with symlinked waldir
         """
         if self.pg_config_version < self.version_to_num('10.0'):
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because waldir outside pgdata is supported since PG 10')
 
         fname = self.id().split('.')[3]
@@ -2176,7 +2176,7 @@ def test_archive_pg_receivexlog_partial_handling(self):
 
         if self.get_version(node) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -2385,7 +2385,7 @@ def test_archive_get_batching_sanity(self):
 
         if self.get_version(node) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
diff --git a/tests/backup.py b/tests/backup.py
index 6028a3ff6..2b099613a 100644
--- a/tests/backup.py
+++ b/tests/backup.py
@@ -1428,7 +1428,7 @@ def test_basic_temp_slot_for_stream_backup(self):
             pg_options={'max_wal_size': '40MB'})
 
         if self.get_version(node) < self.version_to_num('10.0'):
-            return unittest.skip('You need PostgreSQL >= 10 for this test')
+            self.skipTest('You need PostgreSQL >= 10 for this test')
 
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
@@ -1500,7 +1500,7 @@ def test_backup_concurrent_drop_table(self):
     def test_pg_11_adjusted_wal_segment_size(self):
         """"""
         if self.pg_config_version < self.version_to_num('11.0'):
-            return unittest.skip('You need PostgreSQL >= 11 for this test')
+            self.skipTest('You need PostgreSQL >= 11 for this test')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1743,7 +1743,7 @@ def test_drop_table(self):
     def test_basic_missing_file_permissions(self):
         """"""
         if os.name == 'nt':
-            return unittest.skip('Skipped because it is POSIX only test')
+            self.skipTest('Skipped because it is POSIX only test')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1790,7 +1790,7 @@ def test_basic_missing_file_permissions(self):
     def test_basic_missing_dir_permissions(self):
         """"""
         if os.name == 'nt':
-            return unittest.skip('Skipped because it is POSIX only test')
+            self.skipTest('Skipped because it is POSIX only test')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
diff --git a/tests/catchup.py b/tests/catchup.py
index 7ecd84697..baef9d29f 100644
--- a/tests/catchup.py
+++ b/tests/catchup.py
@@ -190,7 +190,7 @@ def test_basic_ptrack_catchup(self):
         Test ptrack catchup
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         # preparation 1: source
         src_pg = self.make_simple_node(
@@ -336,7 +336,7 @@ def test_tli_ptrack_catchup(self):
         Test that we correctly follow timeline change with ptrack catchup
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         # preparation 1: source
         src_pg = self.make_simple_node(
@@ -475,7 +475,7 @@ def test_table_drop_with_ptrack(self):
         Test that dropped table in source will be dropped in ptrack catchup'ed instance too
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         # preparation 1: source
         src_pg = self.make_simple_node(
@@ -590,7 +590,7 @@ def test_tablefile_truncation_with_ptrack(self):
         Test that truncated table in source will be truncated in ptrack catchup'ed instance too
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         # preparation 1: source
         src_pg = self.make_simple_node(
@@ -655,7 +655,7 @@ def test_local_tablespace_without_mapping(self):
         Test that we detect absence of needed --tablespace-mapping option
         """
         if self.remote:
-            return unittest.skip('Skipped because this test tests local catchup error handling')
+            self.skipTest('Skipped because this test tests local catchup error handling')
 
         src_pg = self.make_simple_node(base_dir = os.path.join(module_name, self.fname, 'src'))
         src_pg.slow_start()
@@ -1035,7 +1035,7 @@ def test_unclean_ptrack_catchup(self):
         Test that we correctly recover uncleanly shutdowned destination
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         # preparation 1: source
         src_pg = self.make_simple_node(
@@ -1507,7 +1507,7 @@ def test_dry_run_catchup_ptrack(self):
         Test dry-run option for catchup in incremental ptrack mode
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
          # preparation 1: source
         src_pg = self.make_simple_node(
diff --git a/tests/compatibility.py b/tests/compatibility.py
index 6c2bc9204..3b913aba5 100644
--- a/tests/compatibility.py
+++ b/tests/compatibility.py
@@ -366,7 +366,7 @@ def test_backward_compatibility_ptrack(self):
         """Description in jira issue PGPRO-434"""
 
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
diff --git a/tests/delete.py b/tests/delete.py
index 345a70284..55d08f23b 100644
--- a/tests/delete.py
+++ b/tests/delete.py
@@ -189,7 +189,7 @@ def test_delete_increment_page(self):
     def test_delete_increment_ptrack(self):
         """delete increment and all after him"""
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
diff --git a/tests/external.py b/tests/external.py
index 530e7fb26..a4e3d58f4 100644
--- a/tests/external.py
+++ b/tests/external.py
@@ -1535,7 +1535,7 @@ def test_external_dir_is_symlink(self):
         but restored as directory
         """
         if os.name == 'nt':
-            return unittest.skip('Skipped for Windows')
+            self.skipTest('Skipped for Windows')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1618,7 +1618,7 @@ def test_external_dir_contain_symlink_on_dir(self):
         but restored as directory
         """
         if os.name == 'nt':
-            return unittest.skip('Skipped for Windows')
+            self.skipTest('Skipped for Windows')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1703,7 +1703,7 @@ def test_external_dir_contain_symlink_on_file(self):
         but restored as directory
         """
         if os.name == 'nt':
-            return unittest.skip('Skipped for Windows')
+            self.skipTest('Skipped for Windows')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
diff --git a/tests/false_positive.py b/tests/false_positive.py
index 2ededdf12..6ffc4db10 100644
--- a/tests/false_positive.py
+++ b/tests/false_positive.py
@@ -114,7 +114,7 @@ def test_pg_10_waldir(self):
         test group access for PG >= 11
         """
         if self.pg_config_version < self.version_to_num('10.0'):
-            return unittest.skip('You need PostgreSQL >= 10 for this test')
+            self.skipTest('You need PostgreSQL >= 10 for this test')
 
         fname = self.id().split('.')[3]
         wal_dir = os.path.join(
diff --git a/tests/helpers/__init__.py b/tests/helpers/__init__.py
index ac64c4230..4ae3ef8c4 100644
--- a/tests/helpers/__init__.py
+++ b/tests/helpers/__init__.py
@@ -1,2 +1,9 @@
 __all__ = ['ptrack_helpers', 'cfs_helpers', 'expected_errors']
-#from . import *
\ No newline at end of file
+
+import unittest
+
+# python 2.7 compatibility
+if not hasattr(unittest.TestCase, "skipTest"):
+    def skipTest(self, reason):
+        raise unittest.SkipTest(reason)
+    unittest.TestCase.skipTest = skipTest
\ No newline at end of file
diff --git a/tests/incr_restore.py b/tests/incr_restore.py
index cb684a23a..5bd3711a1 100644
--- a/tests/incr_restore.py
+++ b/tests/incr_restore.py
@@ -1494,7 +1494,7 @@ def test_make_replica_via_incr_checksum_restore(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -1567,7 +1567,7 @@ def test_make_replica_via_incr_lsn_restore(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
diff --git a/tests/merge.py b/tests/merge.py
index 4c374bdfb..566de549b 100644
--- a/tests/merge.py
+++ b/tests/merge.py
@@ -796,7 +796,7 @@ def test_merge_ptrack_truncate(self):
         restore last page backup and check data correctness
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
diff --git a/tests/option.py b/tests/option.py
index 88e72ffd7..61c60a1dd 100644
--- a/tests/option.py
+++ b/tests/option.py
@@ -239,5 +239,5 @@ def test_help_6(self):
                     help_out.read().decode("utf-8")
                 )
         else:
-            return unittest.skip(
+            self.skipTest(
                 'You need configure PostgreSQL with --enabled-nls option for this test')
diff --git a/tests/ptrack.py b/tests/ptrack.py
index a01405d6a..c02aba17c 100644
--- a/tests/ptrack.py
+++ b/tests/ptrack.py
@@ -16,7 +16,7 @@
 class PtrackTest(ProbackupTest, unittest.TestCase):
     def setUp(self):
         if self.pg_config_version < self.version_to_num('11.0'):
-            return unittest.skip('You need PostgreSQL >= 11 for this test')
+            self.skipTest('You need PostgreSQL >= 11 for this test')
         self.fname = self.id().split('.')[3]
 
     # @unittest.skip("skip")
diff --git a/tests/replica.py b/tests/replica.py
index ea69e2d01..d5c24fbc1 100644
--- a/tests/replica.py
+++ b/tests/replica.py
@@ -30,7 +30,7 @@ def test_replica_switchover(self):
 
         if self.get_version(node1) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -103,10 +103,10 @@ def test_replica_stream_ptrack_backup(self):
         take full stream backup from replica
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         if self.pg_config_version > self.version_to_num('9.6.0'):
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         fname = self.id().split('.')[3]
@@ -241,7 +241,7 @@ def test_replica_archive_page_backup(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -383,7 +383,7 @@ def test_basic_make_replica_via_restore(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -441,7 +441,7 @@ def test_take_backup_from_delayed_replica(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -554,7 +554,7 @@ def test_replica_promote(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -645,7 +645,7 @@ def test_replica_stop_lsn_null_offset(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -730,7 +730,7 @@ def test_replica_stop_lsn_null_offset_next_record(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -833,7 +833,7 @@ def test_archive_replica_null_offset(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -917,7 +917,7 @@ def test_archive_replica_not_null_offset(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -1006,7 +1006,7 @@ def test_replica_toast(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -1108,7 +1108,7 @@ def test_start_stop_lsn_in_the_same_segno(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -1186,7 +1186,7 @@ def test_replica_promote_1(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -1313,7 +1313,7 @@ def test_replica_promote_archive_delta(self):
 
         if self.get_version(node1) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -1438,7 +1438,7 @@ def test_replica_promote_archive_page(self):
 
         if self.get_version(node1) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
@@ -1560,7 +1560,7 @@ def test_parent_choosing(self):
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
             self.del_test_dir(module_name, fname)
-            return unittest.skip(
+            self.skipTest(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
         self.init_pb(backup_dir)
diff --git a/tests/restore.py b/tests/restore.py
index 49538bd1f..e99f1158e 100644
--- a/tests/restore.py
+++ b/tests/restore.py
@@ -500,7 +500,7 @@ def test_restore_to_lsn_not_inclusive(self):
     def test_restore_full_ptrack_archive(self):
         """recovery to latest from archive full+ptrack backups"""
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
@@ -554,7 +554,7 @@ def test_restore_full_ptrack_archive(self):
     def test_restore_ptrack(self):
         """recovery to latest from archive full+ptrack+ptrack backups"""
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
@@ -615,7 +615,7 @@ def test_restore_ptrack(self):
     def test_restore_full_ptrack_stream(self):
         """recovery in stream mode to latest from full + ptrack backups"""
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
@@ -673,7 +673,7 @@ def test_restore_full_ptrack_under_load(self):
         with loads when ptrack backup do
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
@@ -742,7 +742,7 @@ def test_restore_full_under_load_ptrack(self):
         with loads when full backup do
         """
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
@@ -2345,7 +2345,7 @@ def test_pg_11_group_access(self):
         test group access for PG >= 11
         """
         if self.pg_config_version < self.version_to_num('11.0'):
-            return unittest.skip('You need PostgreSQL >= 11 for this test')
+            self.skipTest('You need PostgreSQL >= 11 for this test')
 
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
@@ -3680,7 +3680,7 @@ def test_pg_12_probackup_recovery_conf_compatibility(self):
             self.skipTest("You must specify PGPROBACKUPBIN_OLD"
                           " for run this test")
         if self.pg_config_version < self.version_to_num('12.0'):
-           return unittest.skip('You need PostgreSQL >= 12 for this test')
+           self.skipTest('You need PostgreSQL >= 12 for this test')
 
         if self.version_to_num(self.old_probackup_version) >= self.version_to_num('2.4.5'):
             self.assertTrue(False, 'You need pg_probackup < 2.4.5 for this test')
@@ -3752,7 +3752,7 @@ def test_drop_postgresql_auto_conf(self):
         """
 
         if self.pg_config_version < self.version_to_num('12.0'):
-           return unittest.skip('You need PostgreSQL >= 12 for this test')
+           self.skipTest('You need PostgreSQL >= 12 for this test')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -3797,7 +3797,7 @@ def test_truncate_postgresql_auto_conf(self):
         """
 
         if self.pg_config_version < self.version_to_num('12.0'):
-           return unittest.skip('You need PostgreSQL >= 12 for this test')
+           self.skipTest('You need PostgreSQL >= 12 for this test')
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
diff --git a/tests/retention.py b/tests/retention.py
index 122ab28ad..4f95ad5e2 100644
--- a/tests/retention.py
+++ b/tests/retention.py
@@ -1603,7 +1603,7 @@ def test_retention_redundancy_overlapping_chains(self):
 
         if self.get_version(node) < 90600:
             self.del_test_dir(module_name, fname)
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -1653,7 +1653,7 @@ def test_retention_redundancy_overlapping_chains_1(self):
 
         if self.get_version(node) < 90600:
             self.del_test_dir(module_name, fname)
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
diff --git a/tests/time_consuming.py b/tests/time_consuming.py
index c778b9bc3..8908dfd34 100644
--- a/tests/time_consuming.py
+++ b/tests/time_consuming.py
@@ -16,9 +16,9 @@ def test_pbckp150(self):
         """
         # init node
         if self.pg_config_version < self.version_to_num('11.0'):
-            return unittest.skip('You need PostgreSQL >= 11 for this test')
+            self.skipTest('You need PostgreSQL >= 11 for this test')
         if not self.ptrack:
-            return unittest.skip('Skipped because ptrack support is disabled')
+            self.skipTest('Skipped because ptrack support is disabled')
 
         fname = self.id().split('.')[3]
         node = self.make_simple_node(