tests: minor fixes

tests/archive.py

@@ -5,6 +5,7 @@ from datetime import datetime, timedelta
 import subprocess
 from sys import exit
 from time import sleep
+from shutil import copyfile
 
 
 module_name = 'archive'
@@ -39,8 +40,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
 
         result = node.safe_psql("postgres", "SELECT * FROM t_heap")
         self.backup_node(
-            backup_dir, 'node', node,
-            options=["--log-level-file=verbose"])
+            backup_dir, 'node', node)
         node.cleanup()
 
         self.restore_node(
@@ -53,8 +53,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
 
         # Make backup
         self.backup_node(
-            backup_dir, 'node', node,
-            options=["--log-level-file=verbose"])
+            backup_dir, 'node', node)
         node.cleanup()
 
         # Restore Database
@@ -253,7 +252,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
                 backup_dir, 'node', node,
                 options=[
                     "--archive-timeout=60",
-                    "--log-level-file=verbose",
                     "--stream"]
                     )
             # we should die here because exception is what we expect to happen
@@ -402,7 +400,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.expectedFailure
-    # @unittest.skip("skip")
+    @unittest.skip("skip")
     def test_replica_archive(self):
         """
         make node without archiving, take stream backup and
@@ -417,7 +415,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             initdb_params=['--data-checksums'],
             pg_options={
                 'max_wal_senders': '2',
-                'checkpoint_timeout': '30s',
+                'archive_timeout': '10s',
                 'max_wal_size': '1GB'}
             )
         self.init_pb(backup_dir)
@@ -433,7 +431,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             "postgres",
             "create table t_heap as select i as id, md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
-            "from generate_series(0,256) i")
+            "from generate_series(0,2560) i")
 
         self.backup_node(backup_dir, 'master', master, options=['--stream'])
         before = master.safe_psql("postgres", "SELECT * FROM t_heap")
@@ -459,9 +457,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             "md5(repeat(i::text,10))::tsvector as tsvector "
             "from generate_series(256,512) i")
         before = master.safe_psql("postgres", "SELECT * FROM t_heap")
-        # ADD INSTANCE 'REPLICA'
-
-        sleep(1)
 
         backup_id = self.backup_node(
             backup_dir, 'replica', replica,
@@ -469,7 +464,9 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
                 '--archive-timeout=30',
                 '--master-host=localhost',
                 '--master-db=postgres',
-                '--master-port={0}'.format(master.port)])
+                '--master-port={0}'.format(master.port),
+                '--stream'])
+
         self.validate_pb(backup_dir, 'replica')
         self.assertEqual(
             'OK', self.show_pb(backup_dir, 'replica', backup_id)['status'])
@@ -493,16 +490,28 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             "postgres",
             "insert into t_heap as select i as id, md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
-            "from generate_series(512,768) i")
+            "from generate_series(512,20680) i")
+
         before = master.safe_psql("postgres", "SELECT * FROM t_heap")
+
+        master.safe_psql(
+            "postgres",
+            "CHECKPOINT")
+
+#        copyfile(
+#            os.path.join(backup_dir, 'wal/master/000000010000000000000002'),
+#            os.path.join(backup_dir, 'wal/replica/000000010000000000000002'))
+
         backup_id = self.backup_node(
             backup_dir, 'replica',
             replica, backup_type='page',
             options=[
-                '--archive-timeout=30', '--log-level-file=verbose',
-                '--master-host=localhost', '--master-db=postgres',
-                '--master-port={0}'.format(master.port)]
-                )
+                '--archive-timeout=30',
+                '--master-db=postgres',
+                '--master-host=localhost',
+                '--master-port={0}'.format(master.port),
+                '--stream'])
+
         self.validate_pb(backup_dir, 'replica')
         self.assertEqual(
             'OK', self.show_pb(backup_dir, 'replica', backup_id)['status'])
@@ -511,8 +520,10 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
         node.cleanup()
         self.restore_node(
             backup_dir, 'replica', data_dir=node.data_dir, backup_id=backup_id)
+
         node.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(node.port))
+
         node.slow_start()
         # CHECK DATA CORRECTNESS
         after = node.safe_psql("postgres", "SELECT * FROM t_heap")
@@ -537,7 +548,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'checkpoint_timeout': '30s'}
+                'archive_timeout': '10s'}
             )
         replica = self.make_simple_node(
             base_dir="{0}/{1}/replica".format(module_name, fname))
@@ -568,7 +579,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
         pgdata_replica = self.pgdata_content(replica.data_dir)
         self.compare_pgdata(pgdata_master, pgdata_replica)
 
-        self.set_replica(master, replica, synchronous=True)
+        self.set_replica(master, replica)
         # ADD INSTANCE REPLICA
         self.add_instance(backup_dir, 'replica', replica)
         # SET ARCHIVING FOR REPLICA
@@ -579,16 +590,26 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
         after = replica.safe_psql("postgres", "SELECT * FROM t_heap")
         self.assertEqual(before, after)
 
+        master.psql(
+            "postgres",
+            "insert into t_heap select i as id, md5(i::text) as text, "
+            "md5(repeat(i::text,10))::tsvector as tsvector "
+            "from generate_series(0, 60000) i")
+
         # TAKE FULL ARCHIVE BACKUP FROM REPLICA
+        copyfile(
+             os.path.join(backup_dir, 'wal/master/000000010000000000000001'),
+             os.path.join(backup_dir, 'wal/replica/000000010000000000000001'))
+
         backup_id = self.backup_node(
             backup_dir, 'replica', replica,
             options=[
-                '--archive-timeout=20',
-                '--log-level-file=verbose',
+                '--archive-timeout=30',
                 '--master-host=localhost',
                 '--master-db=postgres',
-                '--master-port={0}'.format(master.port)]
-                )
+                '--master-port={0}'.format(master.port),
+                '--stream'])
+
         self.validate_pb(backup_dir, 'replica')
         self.assertEqual(
             'OK', self.show_pb(backup_dir, 'replica', backup_id)['status'])
@@ -618,7 +639,8 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'checkpoint_timeout': '30s'}
+                'checkpoint_timeout': '30s',
+                'archive_timeout': '10s'}
             )
         replica = self.make_simple_node(
             base_dir="{0}/{1}/replica".format(module_name, fname))

tests/backup_test.py

@@ -328,7 +328,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
 
         self.backup_node(
             backup_dir, 'node', node, backup_type="full",
-            options=["-j", "4", "--stream", '--log-level-file=verbose'])
+            options=["-j", "4", "--stream", "--log-level-file=verbose"])
 
         # open log file and check
         with open(os.path.join(backup_dir, 'log', 'pg_probackup.log')) as f:

tests/compatibility.py

@@ -94,8 +94,7 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
         pgbench.stdout.close()
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='page',
-            options=['--log-level-file=verbose'])
+            backup_dir, 'node', node, backup_type='page')
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
@@ -195,8 +194,7 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
         pgbench.stdout.close()
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='delta',
-            options=['--log-level-file=verbose'])
+            backup_dir, 'node', node, backup_type='delta')
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
@@ -296,8 +294,7 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
         pgbench.stdout.close()
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='delta',
-            options=['--log-level-file=verbose'])
+            backup_dir, 'node', node, backup_type='delta')
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)

tests/compression.py

@@ -55,9 +55,7 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
         page_backup_id = self.backup_node(
             backup_dir, 'node', node, backup_type='page',
             options=[
-                '--stream', '--compress-algorithm=zlib',
-                '--log-level-console=verbose',
-                '--log-level-file=verbose'])
+                '--stream', '--compress-algorithm=zlib'])
 
         # PTRACK BACKUP
         node.safe_psql(
@@ -535,8 +533,7 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
             backup_dir, 'node', node,
             backup_type='full',
             options=[
-                '--compress',
-                '--log-level-file=verbose'])
+                '--compress'])
 
         node.cleanup()
 
@@ -547,8 +544,7 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
             backup_dir, 'node', node,
             backup_type='full',
             options=[
-                '--compress',
-                '--log-level-file=verbose'])
+                '--compress'])
 
         # Clean after yourself
         # self.del_test_dir(module_name, fname)

tests/delta.py

@@ -80,13 +80,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
         pgdata = self.pgdata_content(node.data_dir)
 
         self.restore_node(
-            backup_dir,
-            'node',
-            node_restored,
-            options=[
-                "-j", "1",
-                "--log-level-file=verbose"
-            ]
+            backup_dir, 'node', node_restored
         )
 
         # Physical comparison
@@ -176,8 +170,6 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             'node',
             node_restored,
             options=[
-                "-j", "1",
-                "--log-level-file=verbose",
                 "-T", "{0}={1}".format(
                     old_tablespace, new_tablespace)]
         )
@@ -251,13 +243,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
         pgdata = self.pgdata_content(node.data_dir)
 
         self.restore_node(
-            backup_dir,
-            'node',
-            node_restored,
-            options=[
-                "-j", "1",
-                "--log-level-file=verbose"
-            ]
+            backup_dir, 'node', node_restored
         )
 
         # Physical comparison
@@ -683,7 +669,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             node_restored,
             backup_id=backup_id,
             options=[
-                "-j", "4", "--log-level-file=verbose",
+                "-j", "4",
                 "--immediate",
                 "--recovery-target-action=promote"])
 
@@ -717,7 +703,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             node_restored,
             backup_id=backup_id,
             options=[
-                "-j", "4", "--log-level-file=verbose",
+                "-j", "4",
                 "--immediate",
                 "--recovery-target-action=promote"]
         )
@@ -815,7 +801,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
         backup_id = self.backup_node(
             backup_dir, 'node', node,
             backup_type='delta',
-            options=["--stream", "--log-level-file=verbose"]
+            options=["--stream"]
         )
 #        if self.paranoia:
 #            pgdata_delta = self.pgdata_content(
@@ -844,7 +830,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
             node_restored,
             backup_id=backup_id,
             options=[
-                "-j", "4", "--log-level-file=verbose",
+                "-j", "4",
                 "--immediate",
                 "--recovery-target-action=promote"])
 
@@ -1135,7 +1121,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
         self.del_test_dir(module_name, fname)
 
     # @unittest.skip("skip")
-    def test_page_corruption_heal_via_ptrack_1(self):
+    def test_delta_corruption_heal_via_ptrack_1(self):
         """make node, corrupt some page, check that backup failed"""
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
@@ -1174,8 +1160,10 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
                 f.close
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type="delta",
-            options=["-j", "4", "--stream", "--log-level-file=verbose"])
+            backup_dir, 'node', node,
+            backup_type="delta",
+            options=["-j", "4", "--stream", '--log-level-file=verbose'])
+
 
         # open log file and check
         with open(os.path.join(backup_dir, 'log', 'pg_probackup.log')) as f:

tests/exclude.py

@@ -143,7 +143,7 @@ class ExcludeTest(ProbackupTest, unittest.TestCase):
 
         self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['--stream', '--log-level-file=verbose']
+            options=['--stream']
         )
 
         pgdata = self.pgdata_content(node.data_dir)

tests/false_positive.py

@@ -143,7 +143,7 @@ class FalsePositive(ProbackupTest, unittest.TestCase):
         self.backup_node(backup_dir, 'node', node, options=['--stream'])
         gdb = self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['--stream', '--log-level-file=verbose'],
+            options=['--stream'],
             gdb=True
         )
 
@@ -227,7 +227,7 @@ class FalsePositive(ProbackupTest, unittest.TestCase):
         self.backup_node(backup_dir, 'node', node, options=['--stream'])
         gdb = self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['--stream', '--log-level-file=verbose'],
+            options=['--stream'],
             gdb=True
         )
 

tests/merge.py

@@ -407,17 +407,17 @@ class MergeTest(ProbackupTest, unittest.TestCase):
         node.safe_psql(
             "postgres",
             "delete from t_heap where ctid >= '(11,0)'")
+
         node.safe_psql(
             "postgres",
             "vacuum t_heap")
 
-        self.backup_node(
+        page_id = self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack')
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
 
-        page_id = self.show_pb(backup_dir, "node")[1]["id"]
         self.merge_backup(backup_dir, "node", page_id)
 
         self.validate_pb(backup_dir)

tests/page.py

@@ -62,8 +62,7 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             "vacuum t_heap")
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='page',
-            options=['--log-level-file=verbose'])
+            backup_dir, 'node', node, backup_type='page')
 
         self.backup_node(
             backup_dir, 'node', node, backup_type='page')
@@ -333,8 +332,7 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
         result = node.safe_psql("postgres", "select * from pgbench_accounts")
         # PAGE BACKUP
         self.backup_node(
-            backup_dir, 'node', node, backup_type='page',
-            options=["--log-level-file=verbose"])
+            backup_dir, 'node', node, backup_type='page')
         # GET PHYSICAL CONTENT FROM NODE
         pgdata = self.pgdata_content(node.data_dir)
 
@@ -727,7 +725,7 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
             self.backup_node(
                 backup_dir, 'node', node,
                 backup_type='page',
-                options=["-j", "4", '--log-level-file=verbose'])
+                options=["-j", "4"])
             self.assertEqual(
                 1, 0,
                 "Expecting Error because of wal segment disappearance.\n "
@@ -797,8 +795,7 @@ class PageBackupTest(ProbackupTest, unittest.TestCase):
         # Single-thread PAGE backup
         try:
             self.backup_node(
-                backup_dir, 'node', node,
-                backup_type='page', options=['--log-level-file=verbose'])
+                backup_dir, 'node', node, backup_type='page')
             self.assertEqual(
                 1, 0,
                 "Expecting Error because of wal segment disappearance.\n "

tests/ptrack.py

@@ -157,13 +157,13 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
 
         self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['--stream', '--log-level-file=verbose']
+            options=['--stream']
         )
         pgdata = self.pgdata_content(node.data_dir)
 
         self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['--stream', '--log-level-file=verbose']
+            options=['--stream']
         )
 
         self.restore_node(
@@ -246,14 +246,11 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
                 exit(1)
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='ptrack',
-            options=['--log-level-file=verbose']
-        )
+            backup_dir, 'node', node, backup_type='ptrack')
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='ptrack',
-            options=['--log-level-file=verbose']
-        )
+            backup_dir, 'node', node, backup_type='ptrack')
+
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
 
@@ -336,14 +333,10 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         )
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='ptrack',
-            options=['--log-level-file=verbose']
-        )
+            backup_dir, 'node', node, backup_type='ptrack')
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='ptrack',
-            options=['--log-level-file=verbose']
-        )
+            backup_dir, 'node', node, backup_type='ptrack')
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
@@ -409,7 +402,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
 
         self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['--stream', '--log-level-file=verbose']
+            options=['--stream']
         )
 
         node.safe_psql(
@@ -479,7 +472,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         self.backup_node(backup_dir, 'node', node, options=['--stream'])
         gdb = self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['--stream', '--log-level-file=verbose'],
+            options=['--stream'],
             gdb=True
         )
 
@@ -566,7 +559,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         ptrack_backup_id = self.backup_node(
             backup_dir, 'node',
             node, backup_type='ptrack',
-            options=['--stream', '--log-level-file=verbose']
+            options=['--stream']
             )
 
         if self.paranoia:
@@ -989,7 +982,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         node.safe_psql("postgres", "SELECT * FROM t_heap")
         self.backup_node(
             backup_dir, 'node', node,
-            options=["--stream", "--log-level-file=verbose"])
+            options=["--stream"])
 
         # CREATE DATABASE DB1
         node.safe_psql("postgres", "create database db1")
@@ -1002,7 +995,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         backup_id = self.backup_node(
             backup_dir, 'node', node,
             backup_type='ptrack',
-            options=["--stream", "--log-level-file=verbose"]
+            options=["--stream"]
         )
 
         if self.paranoia:
@@ -1133,7 +1126,8 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
                 '-j10',
                 '--master-host=localhost',
                 '--master-db=postgres',
-                '--master-port={0}'.format(node.port)
+                '--master-port={0}'.format(node.port),
+                '--stream'
                 ]
             )
 
@@ -1229,7 +1223,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         self.backup_node(
             backup_dir, 'node', node,
             backup_type='ptrack',
-            options=["--stream", "--log-level-file=verbose"]
+            options=["--stream"]
         )
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
@@ -1315,7 +1309,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         # PTRACK BACKUP
         self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=["--stream", '--log-level-file=verbose'])
+            options=["--stream"])
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
@@ -1476,7 +1470,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         # FIRTS PTRACK BACKUP
         self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=["--stream", "--log-level-file=verbose"])
+            options=["--stream"])
 
         # GET PHYSICAL CONTENT FROM NODE
         if self.paranoia:
@@ -1517,7 +1511,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         # SECOND PTRACK BACKUP
         self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=["--stream", "--log-level-file=verbose"])
+            options=["--stream"])
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
@@ -1612,9 +1606,8 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
         #result = node.safe_psql("postgres", "select * from pgbench_accounts")
         # FIRTS PTRACK BACKUP
         self.backup_node(
-            backup_dir, 'node', node, backup_type='ptrack',
-            options=["--log-level-file=verbose"]
-        )
+            backup_dir, 'node', node, backup_type='ptrack')
+
         # GET PHYSICAL CONTENT FROM NODE
         pgdata = self.pgdata_content(node.data_dir)
 
@@ -1683,9 +1676,8 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
             self.backup_node(
                 backup_dir, 'node', node, backup_type='ptrack',
                 options=[
-                    "--stream", "-j 30",
-                    "--log-level-file=verbose"]
-            )
+                    "--stream", "-j 30"])
+
             # we should die here because exception is what we expect to happen
             self.assertEqual(
                 1, 0,

tests/ptrack_clean.py

@@ -76,7 +76,7 @@ class SimpleTest(ProbackupTest, unittest.TestCase):
         # Take PTRACK backup to clean every ptrack
         backup_id = self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['-j10', '--log-level-file=verbose'])
+            options=['-j10'])
         node.safe_psql('postgres', 'checkpoint')
 
         for i in idx_ptrack:

tests/ptrack_empty.py

@@ -67,7 +67,7 @@ class SimpleTest(ProbackupTest, unittest.TestCase):
         # Take PTRACK backup
         backup_id = self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack',
-            options=['-j10', '--log-level-file=verbose'])
+            options=['-j10'])
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)

tests/replica.py

@@ -162,7 +162,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
             "postgres",
             "create table t_heap as select i as id, md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
-            "from generate_series(0,256) i")
+            "from generate_series(0,2560) i")
 
         before = master.safe_psql("postgres", "SELECT * FROM t_heap")
 
@@ -173,6 +173,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
         # Settings for Replica
         self.set_replica(master, replica)
         self.set_archiving(backup_dir, 'replica', replica, replica=True)
+
         replica.slow_start(replica=True)
 
         # Check data correctness on replica
@@ -186,7 +187,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
             "postgres",
             "insert into t_heap as select i as id, md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
-            "from generate_series(256,512) i")
+            "from generate_series(256,5120) i")
 
         before = master.safe_psql("postgres", "SELECT * FROM t_heap")
         self.add_instance(backup_dir, 'replica', replica)
@@ -195,13 +196,23 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
             os.path.join(backup_dir, 'wal/master/000000010000000000000003'),
             os.path.join(backup_dir, 'wal/replica/000000010000000000000003'))
 
+        copyfile(
+            os.path.join(backup_dir, 'wal/master/000000010000000000000004'),
+            os.path.join(backup_dir, 'wal/replica/000000010000000000000004'))
+
+        copyfile(
+            os.path.join(backup_dir, 'wal/master/000000010000000000000005'),
+            os.path.join(backup_dir, 'wal/replica/000000010000000000000005'))
+
         backup_id = self.backup_node(
             backup_dir, 'replica', replica,
             options=[
-                '--archive-timeout=300',
+                '--archive-timeout=30',
                 '--master-host=localhost',
                 '--master-db=postgres',
-                '--master-port={0}'.format(master.port)])
+                '--master-port={0}'.format(master.port),
+                '--stream'])
+
         self.validate_pb(backup_dir, 'replica')
         self.assertEqual(
             'OK', self.show_pb(backup_dir, 'replica', backup_id)['status'])
@@ -235,10 +246,11 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
             backup_dir, 'replica',
             replica, backup_type='page',
             options=[
-                '--archive-timeout=300',
+                '--archive-timeout=30',
                 '--master-host=localhost',
                 '--master-db=postgres',
-                '--master-port={0}'.format(master.port)])
+                '--master-port={0}'.format(master.port),
+                '--stream'])
 
         self.validate_pb(backup_dir, 'replica')
         self.assertEqual(
@@ -491,7 +503,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
 
         #self.backup_node(backup_dir, 'replica', replica, options=['--stream'])
         exit(1)
-        self.backup_node(backup_dir, 'replica', replica, options=["--log-level-file=verbose"])
+        self.backup_node(backup_dir, 'replica', replica)
         pgbench.wait()
 
         # pgbench

tests/validate_test.py

@@ -50,7 +50,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
             f.close
 
         self.backup_node(
-            backup_dir, 'node', node, options=["--log-level-file=verbose"])
+            backup_dir, 'node', node, options=['--log-level-file=verbose'])
 
         log_file_path = os.path.join(backup_dir, "log", "pg_probackup.log")
 
@@ -259,8 +259,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         # Simple validate
         try:
             self.validate_pb(
-                backup_dir, 'node', backup_id=backup_id_2,
-                options=['--log-level-file=verbose'])
+                backup_dir, 'node', backup_id=backup_id_2)
             self.assertEqual(
                 1, 0,
                 "Expecting Error because of data files corruption.\n "
@@ -364,8 +363,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         # Validate PAGE1
         try:
             self.validate_pb(
-                backup_dir, 'node', backup_id=backup_id_2,
-                options=['--log-level-file=verbose'])
+                backup_dir, 'node', backup_id=backup_id_2)
             self.assertEqual(
                 1, 0,
                 "Expecting Error because of data files corruption.\n "
@@ -520,8 +518,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         try:
             self.validate_pb(
                 backup_dir, 'node',
-                backup_id=backup_id_4,
-                options=['--log-level-file=verbose'])
+                backup_id=backup_id_4)
             self.assertEqual(
                 1, 0,
                 "Expecting Error because of data files corruption.\n"
@@ -721,7 +718,6 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
             self.validate_pb(
                 backup_dir, 'node',
                 options=[
-                    '--log-level-file=verbose',
                     '-i', backup_id_4, '--xid={0}'.format(target_xid)])
             self.assertEqual(
                 1, 0,
@@ -866,7 +862,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         # Validate Instance
         try:
             self.validate_pb(
-                backup_dir, 'node', options=['--log-level-file=verbose'])
+                backup_dir, 'node')
             self.assertEqual(
                 1, 0,
                 "Expecting Error because of data files corruption.\n "
@@ -1006,7 +1002,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
 
         # Validate Instance
         try:
-            self.validate_pb(backup_dir, 'node', options=['--log-level-file=verbose'])
+            self.validate_pb(backup_dir, 'node')
             self.assertEqual(1, 0, "Expecting Error because of data files corruption.\n Output: {0} \n CMD: {1}".format(
                 repr(self.output), self.cmd))
         except ProbackupException as e:
@@ -1092,7 +1088,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
 
         # Validate Instance
         try:
-            self.validate_pb(backup_dir, 'node', options=['--log-level-file=verbose'])
+            self.validate_pb(backup_dir, 'node')
             self.assertEqual(1, 0, "Expecting Error because of data files corruption.\n Output: {0} \n CMD: {1}".format(
                 repr(self.output), self.cmd))
         except ProbackupException as e:
@@ -1219,7 +1215,6 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
                 'node',
                 backup_id,
                 options=[
-                    "--log-level-console=verbose",
                     "--xid={0}".format(target_xid)])
             self.assertEqual(
                 1, 0,
@@ -1388,7 +1383,6 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
                 'node',
                 backup_id,
                 options=[
-                    "--log-level-console=verbose",
                     "--xid={0}".format(target_xid)])
             self.assertEqual(
                 1, 0,
@@ -1671,7 +1665,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
 
         os.rename(file_new, file)
         try:
-            self.validate_pb(backup_dir, options=['--log-level-file=verbose'])
+            self.validate_pb(backup_dir)
         except ProbackupException as e:
             self.assertIn(
                 'WARNING: Some backups are not valid'.format(
@@ -1776,7 +1770,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
         os.rename(file, file_new)
 
         try:
-            self.validate_pb(backup_dir, options=['--log-level-file=verbose'])
+            self.validate_pb(backup_dir)
         except ProbackupException as e:
             self.assertIn(
                 'WARNING: Some backups are not valid'.format(