[Issue #169] test coverage

Author: gsmolk

tests/backup.py

@@ -1023,6 +1023,11 @@ def test_drop_rel_during_backup_page(self):
         # FULL backup
         self.backup_node(backup_dir, 'node', node, options=['--stream'])
 
+        node.safe_psql(
+            "postgres",
+            "insert into t_heap select i"
+            " as id from generate_series(101,102) i")
+
         # PAGE backup
         gdb = self.backup_node(
             backup_dir, 'node', node, backup_type='page',
@@ -1039,11 +1044,10 @@ def test_drop_rel_during_backup_page(self):
 
         pgdata = self.pgdata_content(node.data_dir)
 
-        with open(os.path.join(backup_dir, 'log', 'pg_probackup.log')) as f:
-            log_content = f.read()
-            self.assertTrue(
-                'LOG: File "{0}" is not found'.format(absolute_path) in log_content,
-                'File "{0}" should be deleted but it`s not'.format(absolute_path))
+        backup_id = self.show_pb(backup_dir, 'node')[1]['id']
+
+        filelist = self.get_backup_filelist(backup_dir, 'node', backup_id)
+        self.assertNotIn(relative_path, filelist)
 
         node.cleanup()
         self.restore_node(backup_dir, 'node', node, options=["-j", "4"])
@@ -1347,7 +1351,7 @@ def test_sigint_handling(self):
             backup_dir, 'node', node, gdb=True,
             options=['--stream', '--log-level-file=LOG'])
 
-        gdb.set_breakpoint('copy_file')
+        gdb.set_breakpoint('backup_non_data_file')
         gdb.run_until_break()
 
         gdb.continue_execution_until_break(20)
@@ -1385,7 +1389,7 @@ def test_sigterm_handling(self):
             backup_dir, 'node', node, gdb=True,
             options=['--stream', '--log-level-file=LOG'])
 
-        gdb.set_breakpoint('copy_file')
+        gdb.set_breakpoint('backup_non_data_file')
         gdb.run_until_break()
 
         gdb.continue_execution_until_break(20)
@@ -1422,7 +1426,7 @@ def test_sigquit_handling(self):
         gdb = self.backup_node(
             backup_dir, 'node', node, gdb=True, options=['--stream'])
 
-        gdb.set_breakpoint('copy_file')
+        gdb.set_breakpoint('backup_non_data_file')
         gdb.run_until_break()
 
         gdb.continue_execution_until_break(20)
@@ -1513,7 +1517,7 @@ def test_basic_missing_file_permissions(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertIn(
-                'ERROR: cannot open file',
+                'ERROR: Cannot open file',
                 e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))

tests/compatibility.py

@@ -85,8 +85,8 @@ def test_backward_compatibility_page(self):
         pgbench = node.pgbench(
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
-            options=["-c", "4", "-T", "20"]
-        )
+            options=["-c", "4", "-T", "20"])
+
         pgbench.wait()
         pgbench.stdout.close()
 
@@ -105,6 +105,44 @@ def test_backward_compatibility_page(self):
             pgdata_restored = self.pgdata_content(node_restored.data_dir)
             self.compare_pgdata(pgdata, pgdata_restored)
 
+        node.safe_psql(
+            'postgres',
+            'create table tmp as select * from pgbench_accounts where aid < 1000')
+
+        node.safe_psql(
+            'postgres',
+            'delete from pgbench_accounts')
+
+        node.safe_psql(
+            'postgres',
+            'VACUUM')
+
+        self.backup_node(backup_dir, 'node', node, backup_type='page')
+
+        pgdata = self.pgdata_content(node.data_dir)
+
+        node_restored.cleanup()
+        self.restore_node(
+            backup_dir, 'node', node_restored, options=["-j", "4"])
+
+        pgdata_restored = self.pgdata_content(node_restored.data_dir)
+        self.compare_pgdata(pgdata, pgdata_restored)
+
+        node.safe_psql(
+            'postgres',
+            'insert into pgbench_accounts select * from pgbench_accounts')
+
+        self.backup_node(backup_dir, 'node', node, backup_type='page')
+
+        pgdata = self.pgdata_content(node.data_dir)
+
+        node_restored.cleanup()
+        self.restore_node(
+            backup_dir, 'node', node_restored, options=["-j", "4"])
+
+        pgdata_restored = self.pgdata_content(node_restored.data_dir)
+        self.compare_pgdata(pgdata, pgdata_restored)
+
         # Clean after yourself
         self.del_test_dir(module_name, fname)
 
@@ -118,8 +156,7 @@ def test_backward_compatibility_delta(self):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
             initdb_params=['--data-checksums'],
-            pg_options={
-                'autovacuum': 'off'})
+            pg_options={'autovacuum': 'off'})
 
         self.init_pb(backup_dir, old_binary=True)
         self.show_pb(backup_dir)
@@ -189,8 +226,7 @@ def test_backward_compatibility_delta(self):
         pgbench.wait()
         pgbench.stdout.close()
 
-        self.backup_node(
-            backup_dir, 'node', node, backup_type='delta')
+        self.backup_node(backup_dir, 'node', node, backup_type='delta')
 
         if self.paranoia:
             pgdata = self.pgdata_content(node.data_dir)
@@ -204,6 +240,44 @@ def test_backward_compatibility_delta(self):
             pgdata_restored = self.pgdata_content(node_restored.data_dir)
             self.compare_pgdata(pgdata, pgdata_restored)
 
+        node.safe_psql(
+            'postgres',
+            'create table tmp as select * from pgbench_accounts where aid < 1000')
+
+        node.safe_psql(
+            'postgres',
+            'delete from pgbench_accounts')
+
+        node.safe_psql(
+            'postgres',
+            'VACUUM')
+
+        self.backup_node(backup_dir, 'node', node, backup_type='delta')
+
+        pgdata = self.pgdata_content(node.data_dir)
+
+        node_restored.cleanup()
+        self.restore_node(
+            backup_dir, 'node', node_restored, options=["-j", "4"])
+
+        pgdata_restored = self.pgdata_content(node_restored.data_dir)
+        self.compare_pgdata(pgdata, pgdata_restored)
+
+        node.safe_psql(
+            'postgres',
+            'insert into pgbench_accounts select * from pgbench_accounts')
+
+        self.backup_node(backup_dir, 'node', node, backup_type='delta')
+
+        pgdata = self.pgdata_content(node.data_dir)
+
+        node_restored.cleanup()
+        self.restore_node(
+            backup_dir, 'node', node_restored, options=["-j", "4"])
+
+        pgdata_restored = self.pgdata_content(node_restored.data_dir)
+        self.compare_pgdata(pgdata, pgdata_restored)
+
         # Clean after yourself
         self.del_test_dir(module_name, fname)
 
@@ -530,3 +604,87 @@ def test_backward_compatibility_merge(self):
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)
+
+    # @unittest.expectedFailure
+    # @unittest.skip("skip")
+    def test_backward_compatibility_merge_1(self):
+        """
+        Create node, take FULL and PAGE backups with old binary,
+        merge them with new binary.
+        old binary version =< 2.2.7
+        """
+        fname = self.id().split('.')[3]
+        backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
+        node = self.make_simple_node(
+            base_dir=os.path.join(module_name, fname, 'node'),
+            set_replication=True,
+            initdb_params=['--data-checksums'],
+            pg_options={'autovacuum': 'off'})
+
+        self.init_pb(backup_dir, old_binary=True)
+        self.add_instance(backup_dir, 'node', node, old_binary=True)
+
+        self.set_archiving(backup_dir, 'node', node, old_binary=True)
+        node.slow_start()
+
+        node.pgbench_init(scale=1)
+
+        # FULL backup with OLD binary
+        self.backup_node(
+            backup_dir, 'node', node,
+            old_binary=True)
+
+        pgbench = node.pgbench(
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            options=["-c", "4", "-T", "10"])
+        pgbench.wait()
+        pgbench.stdout.close()
+
+        # PAGE1 backup with OLD binary
+        backup_id = self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='page', old_binary=True)
+
+        node.safe_psql(
+            'postgres',
+            'DELETE from pgbench_accounts')
+
+        node.safe_psql(
+            'postgres',
+            'VACUUM pgbench_accounts')
+
+        # PAGE2 backup with OLD binary
+        backup_id = self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='page', old_binary=True)
+
+        # PAGE3 backup with OLD binary
+        backup_id = self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='page', old_binary=True)
+
+        pgdata = self.pgdata_content(node.data_dir)
+
+        # merge chain created by old binary with new binary
+        output = self.merge_backup(
+            backup_dir, "node", backup_id)
+
+        # check that in-place is disabled
+        self.assertIn(
+            "WARNING: In-place merge is disabled "
+            "because of program versions mismatch", output)
+
+        # restore merged backup
+        node_restored = self.make_simple_node(
+            base_dir=os.path.join(module_name, fname, 'node_restored'))
+        node_restored.cleanup()
+
+        self.restore_node(
+            backup_dir, 'node', node_restored, options=["-j", "4"])
+
+        pgdata_restored = self.pgdata_content(node_restored.data_dir)
+        self.compare_pgdata(pgdata, pgdata_restored)
+
+        # Clean after yourself
+        self.del_test_dir(module_name, fname)

tests/helpers/ptrack_helpers.py

@@ -833,6 +833,9 @@ def backup_node(
         if backup_type:
             cmd_list += ['-b', backup_type]
 
+        if not old_binary:
+            cmd_list += ['--no-sync']
+
         return self.run_pb(cmd_list + options, asynchronous, gdb, old_binary, return_id)
 
     def checkdb_node(
@@ -889,6 +892,9 @@ def restore_node(
         if backup_id:
             cmd_list += ['-i', backup_id]
 
+        if not old_binary:
+            cmd_list += ['--no-sync']
+
         return self.run_pb(cmd_list + options, old_binary=old_binary)
 
     def show_pb(

tests/locking.py

@@ -33,7 +33,7 @@ def test_locking_running_validate_1(self):
         gdb = self.backup_node(
             backup_dir, 'node', node, gdb=True)
 
-        gdb.set_breakpoint('copy_file')
+        gdb.set_breakpoint('backup_non_data_file')
         gdb.run_until_break()
 
         gdb.continue_execution_until_break(20)
@@ -87,7 +87,7 @@ def test_locking_running_validate_2(self):
         gdb = self.backup_node(
             backup_dir, 'node', node, gdb=True)
 
-        gdb.set_breakpoint('copy_file')
+        gdb.set_breakpoint('backup_non_data_file')
         gdb.run_until_break()
 
         gdb.continue_execution_until_break(20)
@@ -156,7 +156,7 @@ def test_locking_running_validate_2_specific_id(self):
         gdb = self.backup_node(
             backup_dir, 'node', node, gdb=True)
 
-        gdb.set_breakpoint('copy_file')
+        gdb.set_breakpoint('backup_non_data_file')
         gdb.run_until_break()
 
         gdb.continue_execution_until_break(20)
@@ -253,7 +253,7 @@ def test_locking_running_3(self):
         gdb = self.backup_node(
             backup_dir, 'node', node, gdb=True)
 
-        gdb.set_breakpoint('copy_file')
+        gdb.set_breakpoint('backup_non_data_file')
         gdb.run_until_break()
 
         gdb.continue_execution_until_break(20)
@@ -399,7 +399,7 @@ def test_locking_restore_locked_without_validation(self):
                     restore_id) in e.message and
                 'is using backup {0} and still is running'.format(
                     backup_id) in e.message and
-                'ERROR: Cannot lock backup directory' in e.message,
+                'ERROR: Cannot lock backup' in e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))