[Issue #174] tests refactoring

Author: gsmolk

tests/archive.py

@@ -398,15 +398,11 @@ def test_archive_push_file_exists(self):
             log_content)
 
         self.assertIn(
-            'INFO: pg_probackup archive-push from',
+            'pg_probackup push file',
             log_content)
 
         self.assertIn(
-            'ERROR: WAL segment ',
-            log_content)
-
-        self.assertIn(
-            'already exists.',
+            'WAL file already exists in archive with different checksum',
             log_content)
 
         self.assertNotIn(
@@ -448,8 +444,7 @@ def test_archive_push_file_exists_overwrite(self):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
             initdb_params=['--data-checksums'],
-            pg_options={
-                'checkpoint_timeout': '30s'})
+            pg_options={'checkpoint_timeout': '30s'})
 
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
@@ -487,24 +482,32 @@ def test_archive_push_file_exists_overwrite(self):
         self.assertIn(
             'DETAIL:  The failed archive command was:', log_content)
         self.assertIn(
-            'INFO: pg_probackup archive-push from', log_content)
+            'pg_probackup push file', log_content)
+        self.assertNotIn(
+            'WAL file already exists in archive with '
+            'different checksum, overwriting', log_content)
         self.assertIn(
-            '{0}" already exists.'.format(filename), log_content)
+            'WAL file already exists in archive with '
+            'different checksum', log_content)
 
         self.assertNotIn(
             'pg_probackup archive-push completed successfully', log_content)
 
         self.set_archiving(backup_dir, 'node', node, overwrite=True)
         node.reload()
         self.switch_wal_segment(node)
-        sleep(2)
+        sleep(5)
 
         with open(log_file, 'r') as f:
             log_content = f.read()
             self.assertTrue(
                 'pg_probackup archive-push completed successfully' in log_content,
                 'Expecting messages about successfull execution archive_command')
 
+        self.assertIn(
+            'WAL file already exists in archive with '
+            'different checksum, overwriting', log_content)
+
         # Clean after yourself
         self.del_test_dir(module_name, fname)
 
@@ -520,7 +523,7 @@ def test_archive_push_partial_file_exists(self):
 
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
-        self.set_archiving(backup_dir, 'node', node)
+        self.set_archiving(backup_dir, 'node', node, log_level='verbose')
 
         node.slow_start()
 
@@ -579,12 +582,9 @@ def test_archive_push_partial_file_exists(self):
         log_file = os.path.join(node.logs_dir, 'postgresql.log')
         with open(log_file, 'r') as f:
             log_content = f.read()
-            self.assertIn(
-                'Cannot open destination temporary WAL file',
-                log_content)
 
             self.assertIn(
-                'Reusing stale destination temporary WAL file',
+                'Reusing stale temp WAL file',
                 log_content)
 
         # Clean after yourself
@@ -905,8 +905,8 @@ def test_basic_master_and_replica_concurrent_archiving(self):
             initdb_params=['--data-checksums'],
             pg_options={
                 'checkpoint_timeout': '30s',
-                'archive_timeout': '10s'}
-            )
+                'archive_timeout': '10s'})
+
         replica = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'replica'))
         replica.cleanup()
@@ -923,6 +923,8 @@ def test_basic_master_and_replica_concurrent_archiving(self):
             "md5(repeat(i::text,10))::tsvector as tsvector "
             "from generate_series(0,10000) i")
 
+        master.pgbench_init(scale=5)
+
         # TAKE FULL ARCHIVE BACKUP FROM MASTER
         self.backup_node(backup_dir, 'master', master)
         # GET LOGICAL CONTENT FROM MASTER
@@ -1718,7 +1720,7 @@ def test_hexadecimal_timeline(self):
 
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
-        self.set_archiving(backup_dir, 'node', node)
+        self.set_archiving(backup_dir, 'node', node, log_level='verbose')
         node.slow_start()
 
         backup_id = self.backup_node(backup_dir, 'node', node)
@@ -1734,6 +1736,8 @@ def test_hexadecimal_timeline(self):
             node.slow_start()
             node.pgbench_init(scale=2)
 
+        sleep(5)
+
         show = self.show_archive(backup_dir)
 
         timelines = show[0]['timelines']

tests/helpers/ptrack_helpers.py

@@ -1131,7 +1131,8 @@ def get_recovery_conf(self, node):
 
     def set_archiving(
             self, backup_dir, instance, node, replica=False,
-            overwrite=False, compress=False, old_binary=False):
+            overwrite=False, compress=False, old_binary=False,
+            log_level=False):
 
         # parse postgresql.auto.conf
         options = {}
@@ -1161,12 +1162,21 @@ def set_archiving(
         if overwrite:
             options['archive_command'] += '--overwrite '
 
+        options['archive_command'] += '--log-level-console=verbose '
+        options['archive_command'] += '-j 10 '
+        options['archive_command'] += '--no-sync '
+
         if os.name == 'posix':
             options['archive_command'] += '--wal-file-path=%p --wal-file-name=%f'
 
         elif os.name == 'nt':
             options['archive_command'] += '--wal-file-path="%p" --wal-file-name="%f"'
 
+        if log_level:
+            options['archive_command'] += ' --log-level-console={0}'.format(log_level)
+            options['archive_command'] += ' --log-level-file={0} '.format(log_level)
+
+
         self.set_auto_conf(node, options)
 
     def get_restore_command(self, backup_dir, instance, node):