Merge branch 'master' into pgpro-1918

Author: gsmolk

tests/locking.py

@@ -17,9 +17,8 @@ def test_locking_simple(self):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             initdb_params=['--data-checksums'],
-            pg_options={
-                'wal_level': 'replica'}
-            )
+            pg_options={'wal_level': 'replica'})
+
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
@@ -28,5 +27,22 @@ def test_locking_simple(self):
 
         self.backup_node(backup_dir, 'node', node)
 
+        gdb = self.backup_node(
+            backup_dir, 'node', node, gdb=True)
+
+        gdb.set_breakpoint('copy_file')
+        gdb.run_until_break()
+
+        if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
+            self.AssertTrue(False, 'Failed to hit breakpoint')
+
+        gdb._execute('signal SIGKILL')
+
+        self.assertEqual(
+            'OK', self.show_pb(backup_dir, 'node')[0]['status'])
+
+        self.assertEqual(
+            'ERROR', self.show_pb(backup_dir, 'node')[1]['status'])
+
         # Clean after yourself
         self.del_test_dir(module_name, fname)