[Issue #138] test coverage

Author: gsmolk

tests/helpers/ptrack_helpers.py

@@ -1131,6 +1131,32 @@ def set_archiving(
 
         self.set_auto_conf(node, options)
 
+    def get_restore_command(self, backup_dir, instance, node):
+
+        # parse postgresql.auto.conf
+        restore_command = ''
+        if os.name == 'posix':
+            restore_command += '{0} archive-get -B {1} --instance={2} '.format(
+                self.probackup_path, backup_dir, instance)
+
+        elif os.name == 'nt':
+            restore_command += '"{0}" archive-get -B {1} --instance={2} '.format(
+                self.probackup_path.replace("\\","\\\\"),
+                backup_dir.replace("\\","\\\\"), instance)
+
+        # don`t forget to kill old_binary after remote ssh release
+        if self.remote:
+            restore_command += '--remote-proto=ssh '
+            restore_command += '--remote-host=localhost '
+
+        if os.name == 'posix':
+            restore_command += '--wal-file-path=%p --wal-file-name=%f'
+
+        elif os.name == 'nt':
+            restore_command += '--wal-file-path="%p" --wal-file-name="%f"'
+
+        return restore_command
+
     def set_auto_conf(self, node, options):
 
         # parse postgresql.auto.conf

tests/restore.py

@@ -3246,3 +3246,85 @@ def test_missing_database_map(self):
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)
+
+    @unittest.skip("skip")
+    def test_stream_restore_command_options(self):
+        """
+        correct handling of restore command options
+        when restoring STREAM backup
+
+        1. Restore STREAM backup with --restore-command only
+        parameter, check that PostgreSQL recovery uses
+        restore_command to obtain WAL from archive.
+
+        2. Restore STREAM backup wuth --restore-command
+        as replica, check that PostgreSQL recovery uses
+        restore_command to obtain WAL from archive.
+        """
+        fname = self.id().split('.')[3]
+        node = self.make_simple_node(
+            base_dir=os.path.join(module_name, fname, 'node'),
+            set_replication=True,
+            initdb_params=['--data-checksums'],
+            pg_options={'max_wal_size': '32MB'})
+
+        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.slow_start()
+
+        if self.get_version(node) >= self.version_to_num('12.0'):
+            recovery_conf = os.path.join(node.data_dir, 'probackup_recovery.conf')
+        else:
+            recovery_conf = os.path.join(node.data_dir, 'recovery.conf')
+
+        # Take FULL
+        self.backup_node(
+            backup_dir, 'node', node, options=['--stream'])
+
+        node.pgbench_init(scale=1)
+
+        node.safe_psql(
+            'postgres',
+            'CHECKPOINT')
+
+        node.pgbench_init(scale=1)
+
+        # restore backup
+        node.cleanup()
+        shutil.rmtree(os.path.join(node.logs_dir))
+
+#        self.restore_node(backup_dir, 'node', node)
+        restore_cmd = self.get_restore_command(backup_dir, 'node', node)
+
+        self.restore_node(
+            backup_dir, 'node', node,
+            options=[
+                '--restore-command={0}'.format(restore_cmd),
+                '--recovery-target-action=pause',
+                '--recovery-target=latest'])
+
+        self.assertTrue(
+            os.path.isfile(recovery_conf),
+            "File {0} do not exists".format(recovery_conf))
+
+        node.slow_start()
+
+        exit(1)
+
+#        self.set_config(
+#            backup_dir ,'node',
+#            options=['--restore-command="cp {0}/%f %p"'.format(wal_dir)])
+#
+#        # restore delta backup
+#        node.cleanup()
+#        self.restore_node(
+#            backup_dir, 'node', node, options=['--recovery-target=immediate'])
+#
+#        self.assertTrue(
+#            os.path.isfile(recovery_conf),
+#            "File {0} do not exists".format(recovery_conf))
+
+        # Clean after yourself
+        self.del_test_dir(module_name, fname)