[PBCKP-236] added PGPROBACKUP_MANUAL testing and PGPROBACKUP_SSH_AGENT_PATH flags.

Ivan Lazarev · Ivan Lazarev · commit 26f9992b2ab4 · 2022-10-25T03:13:12.000+03:00
diff --git a/tests/compatibility.py b/tests/compatibility.py
@@ -8,32 +8,48 @@
 module_name = 'compatibility'
 
 
+def check_manual_tests_enabled():
+    return 'PGPROBACKUP_MANUAL' in os.environ and os.environ['PGPROBACKUP_MANUAL'] == 'ON'
+
+
+def check_ssh_agent_path_exists():
+    return 'PGPROBACKUP_SSH_AGENT_PATH' in os.environ
+
+
 class CompatibilityTest(ProbackupTest, unittest.TestCase):
 
     def setUp(self):
         self.fname = self.id().split('.')[3]
 
     # @unittest.expectedFailure
-    @unittest.skip("skip")
+    @unittest.skipUnless(check_manual_tests_enabled(), 'skip manual test')
+    @unittest.skipUnless(check_ssh_agent_path_exists(), 'skip no ssh agent path exist')
+    # @unittest.skip("skip")
     def test_catchup_with_different_remote_major_pg(self):
         """
         Decription in jira issue PBCKP-236
-        This test requires builds both PGPROEE11 and PGPROEE9_6
+        This test exposures ticket error using pg_probackup builds for both PGPROEE11 and PGPROEE9_6
+
+        Prerequisites:
+        - pg_probackup git tag for PBCKP 2.5.1
+        - master pg_probackup build should be made for PGPROEE11
+        - agent pg_probackup build should be made for PGPROEE9_6
 
-        prerequisites:
-        - git tag for PBCKP 2.5.1
-        - master probackup build should be inside PGPROEE11
-        - agent probackup build is inside PGPROEE9_6
+        Calling probackup PGPROEE9_6 pg_probackup agent from PGPROEE11 pg_probackup master for DELTA backup causes
+        the PBCKP-236 problem
 
-        calling probackup PGPROEE9_6 agent from PGPROEE11 probackup master for DELTA backup causes the PBCKP-236 problem
+        Please give env variables PROBACKUP_MANUAL=ON;PGPROBACKUP_SSH_AGENT_PATH=<pg_probackup_ssh_agent_path>
+        for the test
 
-        please correct path for agent's pg_path_remote_version = '/home/avaness/postgres/postgres.build.ee.9.6/bin/'
+        Please make path for agent's pgprobackup_ssh_agent_path = '/home/avaness/postgres/postgres.build.ee.9.6/bin/'
+        without pg_probackup executable
         """
 
         self.verbose = True
         self.remote = True
-        # please use your own local path
-        pg_path_remote_version = '/home/avaness/postgres/postgres.build.clean/bin'
+        # please use your own local path like
+        # pgprobackup_ssh_agent_path = '/home/avaness/postgres/postgres.build.clean/bin/'
+        pgprobackup_ssh_agent_path = os.environ['PGPROBACKUP_SSH_AGENT_PATH']
 
         src_pg = self.make_simple_node(
             base_dir=os.path.join(module_name, self.fname, 'src'),
@@ -47,14 +63,13 @@ def test_catchup_with_different_remote_major_pg(self):
         # do full catchup
         dst_pg = self.make_empty_node(os.path.join(module_name, self.fname, 'dst'))
         self.catchup_node(
-            backup_mode = 'FULL',
-            source_pgdata = src_pg.data_dir,
-            destination_node = dst_pg,
+            backup_mode='FULL',
+            source_pgdata=src_pg.data_dir,
+            destination_node=dst_pg,
             options=['-d', 'postgres', '-p', str(src_pg.port), '--stream']
             )
 
-        dst_options = {}
-        dst_options['port'] = str(dst_pg.port)
+        dst_options = {'port': str(dst_pg.port)}
         self.set_auto_conf(dst_pg, dst_options)
         dst_pg.slow_start()
         dst_pg.stop()
@@ -66,11 +81,11 @@ def test_catchup_with_different_remote_major_pg(self):
         # do delta catchup with remote pg_probackup agent with another postgres major version
         # this DELTA backup should fail without PBCKP-236 patch.
         self.catchup_node(
-            backup_mode = 'DELTA',
-            source_pgdata = src_pg.data_dir,
-            destination_node = dst_pg,
+            backup_mode='DELTA',
+            source_pgdata=src_pg.data_dir,
+            destination_node=dst_pg,
             # here's substitution of --remoge-path pg_probackup agent compiled with another postgres version
-            options=['-d', 'postgres', '-p', str(src_pg.port), '--stream', '--remote-path=' + pg_path_remote_version]
+            options=['-d', 'postgres', '-p', str(src_pg.port), '--stream', '--remote-path=' + pgprobackup_ssh_agent_path]
             )
 
         # Clean after yourself
