tests: add suit of basic tests

tests/Readme.md

@@ -24,7 +24,11 @@ Specify path to pg_probackup binary file. By default tests use <Path to Git repo
  export PGPROBACKUPBIN=<path to pg_probackup>
 
 Remote backup depends on key authentithication to local machine via ssh as current user.
- PGPROBACKUP_SSH_REMOTE=ON
+ export PGPROBACKUP_SSH_REMOTE=ON
+
+Run suit of basic simple tests:
+ export PG_PROBACKUP_TEST_BASIC=ON
+
 
 Usage:
  pip install testgres

tests/__init__.py

@@ -1,4 +1,5 @@
 import unittest
+import os
 
 from . import init, merge, option, show, compatibility, \
     backup, delete, delta, restore, validate, \
@@ -10,6 +11,10 @@ from . import init, merge, option, show, compatibility, \
 
 def load_tests(loader, tests, pattern):
     suite = unittest.TestSuite()
+
+    if os.environ['PG_PROBACKUP_TEST_BASIC'] == 'ON':
+        loader.testMethodPrefix = 'test_basic'
+
 #    suite.addTests(loader.loadTestsFromModule(auth_test))
     suite.addTests(loader.loadTestsFromModule(archive))
     suite.addTests(loader.loadTestsFromModule(backup))

tests/archive.py

@@ -25,7 +25,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
         self.init_pb(backup_dir)
@@ -83,7 +82,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
         self.init_pb(backup_dir)
@@ -232,7 +230,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
         self.init_pb(backup_dir)
@@ -287,7 +284,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
         self.init_pb(backup_dir)
@@ -363,7 +359,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
         self.init_pb(backup_dir)
@@ -639,7 +634,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.expectedFailure
     # @unittest.skip("skip")
-    def test_master_and_replica_concurrent_archiving(self):
+    def test_basic_master_and_replica_concurrent_archiving(self):
         """
             make node 'master 'with archiving,
             take archive backup and turn it into replica,
@@ -736,7 +731,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'})
 
         self.init_pb(backup_dir)
@@ -810,7 +804,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
         self.init_pb(backup_dir)

tests/backup.py

@@ -263,8 +263,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -291,8 +290,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
 
@@ -348,8 +346,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
 
@@ -521,7 +518,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_tablespace_handling(self):
+    def test_basic_tablespace_handling(self):
         """
         make node, take full backup, check that restore with
         tablespace mapping will end with error, take page backup,
@@ -968,7 +965,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_temp_slot_for_stream_backup(self):
+    def test_basic_temp_slot_for_stream_backup(self):
         """"""
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

tests/checkdb.py

@@ -212,7 +212,7 @@ class CheckdbTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_checkdb_amcheck_only_sanity_1(self):
+    def test_basic_checkdb_amcheck_only_sanity(self):
         """"""
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

tests/compatibility.py

@@ -20,7 +20,6 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'autovacuum': 'off'}
             )
         self.init_pb(backup_dir, old_binary=True)
@@ -123,7 +122,6 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'autovacuum': 'off'}
             )
         self.init_pb(backup_dir, old_binary=True)
@@ -226,7 +224,6 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'autovacuum': 'off'}
             )
         self.init_pb(backup_dir, old_binary=True)
@@ -329,7 +326,6 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'autovacuum': 'off'})
 
         self.init_pb(backup_dir, old_binary=True)
@@ -494,7 +490,6 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'autovacuum': 'off'})
 
         self.init_pb(backup_dir, old_binary=True)

tests/compression.py

@@ -12,7 +12,7 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.skip("skip")
     # @unittest.expectedFailure
-    def test_compression_stream_zlib(self):
+    def test_basic_compression_stream_zlib(self):
         """
         make archive node, make full and page stream backups,
         check data correctness in restored instance
@@ -25,7 +25,6 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on'}
             )
@@ -245,7 +244,6 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on'}
             )
@@ -355,7 +353,6 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on'}
             )
@@ -465,7 +462,6 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on'}
             )

tests/delta.py

@@ -13,7 +13,7 @@ module_name = 'delta'
 class DeltaTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.skip("skip")
-    def test_delta_vacuum_truncate_1(self):
+    def test_basic_delta_vacuum_truncate(self):
         """
         make node, create table, take full backup,
         delete last 3 pages, vacuum relation,
@@ -27,7 +27,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'autovacuum': 'off'})
 
@@ -92,7 +91,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_delta_vacuum_truncate_2(self):
+    def test_delta_vacuum_truncate_1(self):
         """
         make node, create table, take full backup,
         delete last 3 pages, vacuum relation,
@@ -106,7 +105,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'autovacuum': 'off'
             }
@@ -182,7 +180,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_delta_vacuum_truncate_3(self):
+    def test_delta_vacuum_truncate_2(self):
         """
         make node, create table, take full backup,
         delete last 3 pages, vacuum relation,
@@ -196,7 +194,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'autovacuum': 'off'
             }
@@ -265,7 +262,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'
                 }
             )
@@ -424,7 +420,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'fsync': 'off',
                 'shared_buffers': '1GB',
                 'maintenance_work_mem': '1GB',
@@ -506,7 +501,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s'
             }
         )
@@ -598,7 +592,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'max_wal_size': '10GB',
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '5min',
                 'autovacuum': 'off'
             }
@@ -728,7 +721,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'max_wal_size': '10GB',
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '5min',
                 'autovacuum': 'off'
             }
@@ -835,7 +827,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'autovacuum': 'off'
             }
@@ -1019,7 +1010,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'autovacuum': 'off'
             }
@@ -1099,8 +1089,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
 
@@ -1158,8 +1147,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
 

tests/external.py

@@ -13,7 +13,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.skip("skip")
     # @unittest.expectedFailure
-    def test_external_simple(self):
+    def test_basic_external(self):
         """
         make node, create external directory, take backup
         with external directory, restore backup, check that

tests/false_positive.py

@@ -20,9 +20,7 @@ class FalsePositive(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -123,7 +121,6 @@ class FalsePositive(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'ptrack_enable': 'on'
             }
@@ -205,7 +202,6 @@ class FalsePositive(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'ptrack_enable': 'on'
             }

tests/merge.py

@@ -12,7 +12,7 @@ module_name = "merge"
 
 class MergeTest(ProbackupTest, unittest.TestCase):
 
-    def test_merge_full_page(self):
+    def test_basic_merge_full_page(self):
         """
         Test MERGE command, it merges FULL backup with target PAGE backups
         """

tests/page.py

@@ -13,7 +13,7 @@ module_name = 'page'
 class PageBackupTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.skip("skip")
-    def test_page_vacuum_truncate(self):
+    def test_basic_page_vacuum_truncate(self):
         """
         make node, create table, take full backup,
         delete last 3 pages, vacuum relation,
@@ -27,7 +27,6 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'autovacuum': 'off'
             }
@@ -119,7 +118,6 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
 
@@ -207,7 +205,6 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
 
@@ -301,7 +298,6 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'fsync': 'off',
                 'shared_buffers': '1GB',
                 'maintenance_work_mem': '1GB',
@@ -383,7 +379,6 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'autovacuum': 'off'
             }
@@ -462,7 +457,6 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'autovacuum': 'off'
             }
@@ -1030,7 +1024,6 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'max_wal_size': '10GB',
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '5min',
                 'autovacuum': 'off'
             }

tests/ptrack.py

@@ -24,7 +24,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'
             }
         )
@@ -72,7 +71,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on'
             }
@@ -132,7 +130,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'ptrack_enable': 'on'
             }
@@ -193,7 +190,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'ptrack_enable': 'on'
             }
@@ -284,7 +280,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'
@@ -369,7 +364,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'ptrack_enable': 'on'
             }
@@ -444,7 +438,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'ptrack_enable': 'on'
             }
@@ -515,7 +508,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'
@@ -609,7 +601,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'
@@ -715,7 +706,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'}
@@ -797,7 +787,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'}
@@ -868,7 +857,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on', 'autovacuum': 'off'
             }
@@ -945,7 +933,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'max_wal_size': '10GB',
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '5min',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'
@@ -1070,7 +1057,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'
@@ -1169,7 +1155,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'
@@ -1266,7 +1251,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'}
@@ -1336,7 +1320,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'ptrack_enable': 'on',
                 'autovacuum': 'off'}
@@ -1419,7 +1402,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s', 'ptrack_enable': 'on',
                 'autovacuum': 'off'})
 
@@ -1531,7 +1513,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'ptrack_enable': 'on', 'fsync': 'off',
                 'autovacuum': 'off',
                 'full_page_writes': 'off'
@@ -1641,7 +1622,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'ptrack_enable': 'on',
-                'max_wal_senders': '2',
                 'max_connections': '15'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1693,8 +1673,8 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
+
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
@@ -1805,7 +1785,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'ptrack_enable': 'on',
-                'max_wal_senders': '2',
                 'archive_timeout': '30s'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1940,8 +1919,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2020,8 +1998,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2097,8 +2074,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2196,8 +2172,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2302,7 +2277,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'ptrack_enable': 'on',
-                'max_wal_senders': '2',
                 'autovacuum': 'off'})
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2381,8 +2355,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2475,8 +2448,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2644,8 +2616,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2731,7 +2702,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'ptrack_enable': 'on',
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -2839,8 +2809,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2918,8 +2887,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -3022,8 +2990,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -3102,8 +3069,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -3183,7 +3149,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'ptrack_enable': 'on',
-                'max_wal_senders': '2',
                 'autovacuum': 'off',
                 'archive_timeout': '30s'}
             )
@@ -3291,8 +3256,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -3372,7 +3336,6 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'ptrack_enable': 'on',
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -3471,8 +3434,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'ptrack_enable': 'on',
+                'ptrack_enable': 'on'})
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)

tests/replica.py

@@ -278,7 +278,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_make_replica_via_restore(self):
+    def test_basic_make_replica_via_restore(self):
         """
         make archive master, take full and page archive backups from master,
         set replica, make archive backup from replica

tests/restore.py

@@ -1301,7 +1301,6 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
             conn.execute(
                 "insert into tbl select i from generate_series(0,100) as i")
 
-
         node_restored = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node_restored'),
             initdb_params=['--data-checksums'])
@@ -1439,9 +1438,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -1529,9 +1526,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={
-                'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)

tests/retention.py

@@ -739,7 +739,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_window_merge_multiple_descendants(self):
+    def test_basic_window_merge_multiple_descendants(self):
         """
         PAGEb3
           |                 PAGEa3
@@ -938,8 +938,6 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
                 '--retention-window=1', '--expired',
                 '--merge-expired', '--log-level-console=log'])
 
-        print(output)
-
         self.assertEqual(len(self.show_pb(backup_dir, 'node')), 3)
 
         # Merging chain A

tests/validate.py

@@ -15,7 +15,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.skip("skip")
     # @unittest.expectedFailure
-    def test_validate_nullified_heap_page_backup(self):
+    def test_basic_validate_nullified_heap_page_backup(self):
         """
         make node with nullified heap block
         """
@@ -216,7 +216,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_validate_corrupted_intermediate_backup(self):
+    def test_basic_validate_corrupted_intermediate_backup(self):
         """
         make archive node, take FULL, PAGE1, PAGE2 backups,
         corrupt file in PAGE1 backup,
@@ -1621,8 +1621,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -1663,8 +1662,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -1694,8 +1692,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node1 = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node1'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -1808,7 +1805,6 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1931,8 +1927,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2043,8 +2038,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2396,8 +2390,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2697,8 +2690,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2841,8 +2833,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2963,8 +2954,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -3153,8 +3143,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -3301,8 +3290,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
-            initdb_params=['--data-checksums'],
+            initdb_params=['--data-checksums'])
-            pg_options={'max_wal_senders': '2'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)