tests: update tests due to recovery target action been set to "pause"

Author: gsmolk

tests/archive.py

@@ -44,7 +44,9 @@ def test_pgpro434_1(self):
             options=["--log-level-file=verbose"])
         node.cleanup()
 
-        self.restore_node(backup_dir, 'node', node)
+        self.restore_node(
+            backup_dir, 'node', node,
+            options=["--recovery-target-action=promote"])
         node.start()
         while node.safe_psql(
             "postgres",
@@ -62,7 +64,9 @@ def test_pgpro434_1(self):
         node.cleanup()
 
         # Restore Database
-        self.restore_node(backup_dir, 'node', node)
+        self.restore_node(
+            backup_dir, 'node', node,
+            options=["--recovery-target-action=promote"])
         node.start()
         while node.safe_psql(
             "postgres",

tests/compression.py

@@ -297,10 +297,15 @@ def test_compression_wrong_algorithm(self):
         self.maxDiff = None
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
-        node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
+        node = self.make_simple_node(
+            base_dir="{0}/{1}/node".format(module_name, fname),
             set_replication=True,
             initdb_params=['--data-checksums'],
-            pg_options={'wal_level': 'replica', 'max_wal_senders': '2', 'checkpoint_timeout': '30s', 'ptrack_enable': 'on'}
+            pg_options={
+                'wal_level': 'replica',
+                'max_wal_senders': '2',
+                'checkpoint_timeout': '30s',
+                'ptrack_enable': 'on'}
             )
 
         self.init_pb(backup_dir)
@@ -309,14 +314,21 @@ def test_compression_wrong_algorithm(self):
         node.start()
 
         try:
-            self.backup_node(backup_dir, 'node', node, backup_type='full', options=['--compress-algorithm=bla-blah'])
+            self.backup_node(
+                backup_dir, 'node', node,
+                backup_type='full', options=['--compress-algorithm=bla-blah'])
             # we should die here because exception is what we expect to happen
-            self.assertEqual(1, 0, "Expecting Error because restore destionation is not empty.\n Output: {0} \n CMD: {1}".format(
-                repr(self.output), self.cmd))
+            self.assertEqual(
+                1, 0,
+                "Expecting Error because compress-algorithm is invalid.\n "
+                "Output: {0} \n CMD: {1}".format(
+                    repr(self.output), self.cmd))
         except ProbackupException as e:
-            self.assertEqual(e.message,
+            self.assertEqual(
+                e.message,
                 'ERROR: invalid compress algorithm value "bla-blah"\n',
-                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))
+                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
+                    repr(e.message), self.cmd))
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)

tests/delta.py

@@ -487,7 +487,8 @@ def test_delta_multiple_segments(self):
             restored_node, 'somedata_restored')
 
         self.restore_node(backup_dir, 'node', restored_node, options=[
-            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new)])
+            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new),
+            "--recovery-target-action=promote"])
 
         # GET PHYSICAL CONTENT FROM NODE_RESTORED
         pgdata_restored = self.pgdata_content(restored_node.data_dir)
@@ -911,7 +912,8 @@ def test_alter_table_set_tablespace_delta(self):
                 "-T", "{0}={1}".format(
                     self.get_tblspace_path(node, 'somedata_new'),
                     self.get_tblspace_path(node_restored, 'somedata_new')
-                )
+                ),
+                "--recovery-target-action=promote"
             ]
         )
 

tests/expected/option_help.out

@@ -29,19 +29,34 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
   pg_probackup backup -B backup-path -b backup-mode --instance=instance_name
                  [-C] [--stream [-S slot-name]] [--backup-pg-log]
                  [-j num-threads] [--archive-timeout=archive-timeout]
+                 [--progress]
+                 [--log-level-console=log-level-console]
+                 [--log-level-file=log-level-file]
+                 [--log-filename=log-filename]
+                 [--error-log-filename=error-log-filename]
+                 [--log-directory=log-directory]
+                 [--log-rotation-size=log-rotation-size]
+                 [--log-rotation-age=log-rotation-age]
+                 [--delete-expired] [--delete-wal]
+                 [--retention-redundancy=retention-redundancy]
+                 [--retention-window=retention-window]
                  [--compress]
                  [--compress-algorithm=compress-algorithm]
                  [--compress-level=compress-level]
-                 [--progress] [--delete-expired]
                  [-d dbname] [-h host] [-p port] [-U username]
+                 [-w --no-password] [-W --password]
                  [--master-db=db_name] [--master-host=host_name]
                  [--master-port=port] [--master-user=user_name]
                  [--replica-timeout=timeout]
 
+
   pg_probackup restore -B backup-dir --instance=instance_name
                  [-D pgdata-dir] [-i backup-id] [--progress]
                  [--time=time|--xid=xid [--inclusive=boolean]]
                  [--timeline=timeline] [-T OLDDIR=NEWDIR]
+                 [--immediate] [--recovery-target-name=target-name]
+                 [--recovery-target-action=pause|promote|shutdown]
+                 [--restore-as-replica]
 
   pg_probackup validate -B backup-dir [--instance=instance_name]
                  [-i backup-id] [--progress]

tests/page.py

@@ -84,8 +84,10 @@ def test_page_vacuum_truncate(self):
 
         self.restore_node(
             backup_dir, 'node', node_restored,
-            options=["-j", "4", "-T", "{0}={1}".format(
-                old_tablespace, new_tablespace)]
+            options=[
+                "-j", "4",
+                "-T", "{0}={1}".format(old_tablespace, new_tablespace),
+                "--recovery-target-action=promote"]
         )
 
         # Physical comparison
@@ -331,8 +333,12 @@ def test_page_multiple_segments(self):
         tblspc_path_new = self.get_tblspace_path(
             restored_node, 'somedata_restored')
 
-        self.restore_node(backup_dir, 'node', restored_node, options=[
-            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new)])
+        self.restore_node(
+            backup_dir, 'node', restored_node,
+            options=[
+                "-j", "4",
+                "--recovery-target-action=promote",
+                "-T", "{0}={1}".format(tblspc_path, tblspc_path_new)])
 
         # GET PHYSICAL CONTENT FROM NODE_RESTORED
         pgdata_restored = self.pgdata_content(restored_node.data_dir)

tests/ptrack.py

@@ -759,7 +759,7 @@ def test_ptrack_stream(self):
             self.restore_node(
                 backup_dir, 'node', node,
                 backup_id=full_backup_id,
-                options=["-j", "4"]
+                options=["-j", "4", "--recovery-target-action=promote"]
             ),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd)
@@ -778,7 +778,7 @@ def test_ptrack_stream(self):
             self.restore_node(
                 backup_dir, 'node', node,
                 backup_id=ptrack_backup_id,
-                options=["-j", "4"]
+                options=["-j", "4", "--recovery-target-action=promote"]
             ),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd)
@@ -861,7 +861,9 @@ def test_ptrack_archive(self):
             self.restore_node(
                 backup_dir, 'node', node,
                 backup_id=full_backup_id,
-                options=["-j", "4", "--time={0}".format(full_target_time)]
+                options=[
+                    "-j", "4", "--recovery-target-action=promote",
+                    "--time={0}".format(full_target_time)]
             ),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd)
@@ -880,7 +882,10 @@ def test_ptrack_archive(self):
             self.restore_node(
                 backup_dir, 'node', node,
                 backup_id=ptrack_backup_id,
-                options=["-j", "4", "--time={0}".format(ptrack_target_time)]
+                options=[
+                    "-j", "4",
+                    "--time={0}".format(ptrack_target_time),
+                    "--recovery-target-action=promote"]
             ),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd)
@@ -1320,7 +1325,8 @@ def test_alter_table_set_tablespace_ptrack(self):
                 "-T", "{0}={1}".format(
                     self.get_tblspace_path(node, 'somedata_new'),
                     self.get_tblspace_path(node_restored, 'somedata_new')
-                )
+                ),
+                "--recovery-target-action=promote"
             ]
         )
 
@@ -1549,7 +1555,8 @@ def test_ptrack_alter_tablespace(self):
         tblspc_path_new = self.get_tblspace_path(
             restored_node, 'somedata_restored')
         self.restore_node(backup_dir, 'node', restored_node, options=[
-            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new)])
+            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new),
+            "--recovery-target-action=promote"])
 
         # GET PHYSICAL CONTENT FROM RESTORED NODE and COMPARE PHYSICAL CONTENT
         if self.paranoia:
@@ -1585,7 +1592,8 @@ def test_ptrack_alter_tablespace(self):
 
         # Restore second ptrack backup and check table consistency
         self.restore_node(backup_dir, 'node', restored_node, options=[
-            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new)])
+            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new),
+            "--recovery-target-action=promote"])
 
         # GET PHYSICAL CONTENT FROM RESTORED NODE and COMPARE PHYSICAL CONTENT
         if self.paranoia:
@@ -1682,7 +1690,8 @@ def test_ptrack_multiple_segments(self):
         )
 
         self.restore_node(backup_dir, 'node', restored_node, options=[
-            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new)])
+            "-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new),
+            "--recovery-target-action=promote"])
 
         # GET PHYSICAL CONTENT FROM NODE_RESTORED
         if self.paranoia: