Merge branch 'issue_439' into PGPRO-5421

Author: kulaginm

Diff for: tests/archive.py

@@ -83,6 +83,12 @@ def test_pgpro434_2(self):
             pg_options={
                 'checkpoint_timeout': '30s'}
             )
+
+        if self.get_version(node) < self.version_to_num('9.6.0'):
+            self.del_test_dir(module_name, fname)
+            return unittest.skip(
+                'Skipped because pg_control_checkpoint() is not supported in PG 9.5')
+
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
         self.set_archiving(backup_dir, 'node', node)
@@ -693,6 +699,11 @@ def test_replica_archive(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)
         # ADD INSTANCE 'MASTER'
         self.add_instance(backup_dir, 'master', master)
@@ -818,6 +829,12 @@ def test_master_and_replica_parallel_archiving(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')
+
         replica = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'replica'))
         replica.cleanup()
@@ -908,6 +925,11 @@ def test_basic_master_and_replica_concurrent_archiving(self):
                 'checkpoint_timeout': '30s',
                 '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')
+
         replica = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'replica'))
         replica.cleanup()
@@ -2145,6 +2167,11 @@ def test_archive_pg_receivexlog_partial_handling(self):
             set_replication=True,
             initdb_params=['--data-checksums'])
 
+        if self.get_version(node) < 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, 'node', node)
 
@@ -2791,4 +2818,4 @@ def test_archive_empty_history_file(self):
 #t2      ----------------
 #       /
 #t1 -A--------
-#
+#