tests: additional retention test

Author: gsmolk

tests/delete_test.py

@@ -55,6 +55,51 @@ def test_delete_full_backups(self):
         # Clean after yourself
         self.del_test_dir(module_name, fname)
 
+    # @unittest.skip("skip")
+    # @unittest.expectedFailure
+    def test_delete_archive_mix_compress_and_non_compressed_segments(self):
+        """delete full backups"""
+        fname = self.id().split('.')[3]
+        node = self.make_simple_node(
+            base_dir="{0}/{1}/node".format(module_name, fname),
+            initdb_params=['--data-checksums'],
+            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)
+        self.set_archiving(backup_dir, 'node', node)
+        node.start()
+
+        # full backup
+        self.backup_node(backup_dir, 'node', node)
+
+        pgbench = node.pgbench(
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        pgbench.wait()
+        pgbench.stdout.close()
+
+        self.backup_node(backup_dir, 'node', node)
+
+        pgbench = node.pgbench(
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        pgbench.wait()
+        pgbench.stdout.close()
+
+        self.backup_node(backup_dir, 'node', node)
+
+        show_backups = self.show_pb(backup_dir, 'node')
+        id_1 = show_backups[0]['ID']
+        id_2 = show_backups[1]['ID']
+        id_3 = show_backups[2]['ID']
+        self.delete_pb(backup_dir, 'node', id_2)
+        show_backups = self.show_pb(backup_dir, 'node')
+        self.assertEqual(show_backups[0]['ID'], id_1)
+        self.assertEqual(show_backups[1]['ID'], id_3)
+
+        # Clean after yourself
+        self.del_test_dir(module_name, fname)
+
     # @unittest.skip("skip")
     def test_delete_increment_page(self):
         """delete increment and all after him"""

tests/helpers/ptrack_helpers.py

@@ -874,7 +874,7 @@ def get_recovery_conf(self, node):
         return out_dict
 
     def set_archiving(
-            self, backup_dir, instance, node, replica=False, overwrite=False,
+            self, backup_dir, instance, node, replica=False, overwrite=False, compress=False,
             old_binary=False):
 
         if replica:
@@ -895,7 +895,7 @@ def set_archiving(
             self.probackup_path, backup_dir, instance)
 
         if os.name == 'posix':
-            if self.archive_compress:
+            if self.archive_compress or compress:
                 archive_command = archive_command + "--compress "
 
             if overwrite: