tests: fixes for 9.5

Author: gsmolk

tests/expected/option_help.out

@@ -76,7 +76,7 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
                  [--recovery-target=immediate|latest]
                  [--recovery-target-name=target-name]
                  [--recovery-target-action=pause|promote|shutdown]
-                 [--restore-as-replica]
+                 [--restore-as-replica] [--force]
                  [--no-validate] [--skip-block-validation]
                  [-T OLDDIR=NEWDIR] [--progress]
                  [--external-mapping=OLDDIR=NEWDIR]

tests/remote.py

@@ -16,6 +16,7 @@ def test_remote_sanity(self):
         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'])
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -26,7 +27,7 @@ def test_remote_sanity(self):
         try:
             self.backup_node(
                 backup_dir, 'node',
-                node, options=['--remote-proto=ssh', '--stream'])
+                node, options=['--remote-proto=ssh', '--stream'], no_remote=True)
             # we should die here because exception is what we expect to happen
             self.assertEqual(
                 1, 0,

tests/replica.py

@@ -11,7 +11,6 @@
 
 module_name = 'replica'
 
-
 class ReplicaTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.skip("skip")
@@ -33,6 +32,11 @@ def test_replica_stream_ptrack_backup(self):
             pg_options={
                 'ptrack_enable': 'on'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         master.slow_start()
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
@@ -149,6 +153,11 @@ def test_replica_archive_page_backup(self):
                 'checkpoint_timeout': '30s',
                 'max_wal_size': '32MB'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -290,6 +299,11 @@ def test_basic_make_replica_via_restore(self):
             pg_options={
                 'archive_timeout': '10s'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -343,6 +357,11 @@ def test_take_backup_from_delayed_replica(self):
             initdb_params=['--data-checksums'],
             pg_options={'archive_timeout': '10s'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -445,6 +464,11 @@ def test_replica_promote(self):
                 'checkpoint_timeout': '30s',
                 'max_wal_size': '32MB'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -530,6 +554,11 @@ def test_replica_stop_lsn_null_offset(self):
                 'checkpoint_timeout': '1h',
                 'wal_level': 'replica'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -612,6 +641,11 @@ def test_replica_stop_lsn_null_offset_next_record(self):
                 'checkpoint_timeout': '1h',
                 'wal_level': 'replica'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -706,6 +740,11 @@ def test_archive_replica_null_offset(self):
                 'checkpoint_timeout': '1h',
                 'wal_level': 'replica'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -790,6 +829,11 @@ def test_archive_replica_not_null_offset(self):
                 'checkpoint_timeout': '1h',
                 'wal_level': 'replica'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -875,6 +919,11 @@ def test_replica_toast(self):
                 'checkpoint_timeout': '1h',
                 'wal_level': 'replica'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
@@ -969,6 +1018,11 @@ def test_replica_promote_1(self):
                 'checkpoint_timeout': '1h',
                 'wal_level': 'replica'})
 
+        if self.get_version(master) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because backup from replica is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'master', master)
         # set replica True, so archive_mode 'always' is used.