make separate function for node creation in catchup tests (make_empty_node)

Author: kulaginm

tests/catchup.py

@@ -36,10 +36,11 @@ def test_multithread_local_transfer(self):
             "CREATE TABLE ultimate_question AS SELECT 42 AS answer")
         result = source_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
 
+        dest_pg = self.make_empty_node(os.path.join(module_name, fname, 'dst'))
         dest_pg = self.catchup_node(
             backup_mode = 'FULL',
             source_pgdata = source_pg.data_dir,
-            destination_base_dir = os.path.join(module_name, fname, 'dst'),
+            destination_node = dest_pg,
             options = ['-d', 'postgres', '-p', str(source_pg.port), '--stream', '-j', '4']
             )
         source_pg.stop()
@@ -69,10 +70,11 @@ def test_multithread_remote_transfer(self):
             "CREATE TABLE ultimate_question AS SELECT 42 AS answer")
         result = source_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
 
+        dest_pg = self.make_empty_node(os.path.join(module_name, fname, 'dst'))
         dest_pg = self.catchup_node(
             backup_mode = 'FULL',
             source_pgdata = source_pg.data_dir,
-            destination_base_dir = os.path.join(module_name, fname, 'dst'),
+            destination_node = dest_pg,
             options = ['-d', 'postgres', '-p', str(source_pg.port), '--stream', '-j', '4'])
         source_pg.stop()
 
@@ -109,10 +111,11 @@ def test_remote_catchup(self):
         source_pg.safe_psql("postgres", "CREATE TABLE ultimate_question(answer int)")
 
         # make clean shutdowned lagging behind replica
+        dest_pg = self.make_empty_node(os.path.join(module_name, fname, 'dst'))
         dest_pg = self.catchup_node(
             backup_mode = 'FULL',
             source_pgdata = source_pg.data_dir,
-            destination_base_dir = os.path.join(module_name, fname, 'dst'),
+            destination_node = dest_pg,
             options = ['-d', 'postgres', '-p', str(source_pg.port), '--stream'])
         self.set_replica(source_pg, dest_pg)
         dest_pg.slow_start(replica = True)
@@ -129,9 +132,8 @@ def test_remote_catchup(self):
         self.catchup_node(
             backup_mode = 'PTRACK',
             source_pgdata = source_pg.data_dir,
-            destination_base_dir = os.path.join(module_name, fname, 'dst'),
-            options = ['-d', 'postgres', '-p', str(source_pg.port), '--stream'],
-            node = dest_pg)
+            destination_node = dest_pg,
+            options = ['-d', 'postgres', '-p', str(source_pg.port), '--stream'])
 
         # stop replication
         source_pg.stop()

tests/helpers/ptrack_helpers.py

@@ -335,14 +335,9 @@ def pg_config_version(self):
 #                print('PGPROBACKUP_SSH_USER is not set')
 #                exit(1)
 
-    def make_simple_node(
+    def make_empty_node(
             self,
-            base_dir=None,
-            set_replication=False,
-            ptrack_enable=False,
-            initdb_params=[],
-            pg_options={}):
-
+            base_dir=None):
         real_base_dir = os.path.join(self.tmp_path, base_dir)
         shutil.rmtree(real_base_dir, ignore_errors=True)
         os.makedirs(real_base_dir)
@@ -351,6 +346,17 @@ def make_simple_node(
         # bound method slow_start() to 'node' class instance
         node.slow_start = slow_start.__get__(node)
         node.should_rm_dirs = True
+        return node
+
+    def make_simple_node(
+            self,
+            base_dir=None,
+            set_replication=False,
+            ptrack_enable=False,
+            initdb_params=[],
+            pg_options={}):
+
+        node = self.make_empty_node(base_dir)
         node.init(
            initdb_params=initdb_params, allow_streaming=set_replication)
 
@@ -1033,32 +1039,24 @@ def restore_node(
 
     def catchup_node(
             self,
-            backup_mode, source_pgdata, destination_base_dir,
-            options = [],
-            node = None
+            backup_mode, source_pgdata, destination_node,
+            options = []
             ):
 
-        real_destination_dir = os.path.join(self.tmp_path, destination_base_dir)
-        if not node:
-            shutil.rmtree(real_destination_dir, ignore_errors = True)
-            node = testgres.get_new_node('test', base_dir = real_destination_dir)
-            node.slow_start = slow_start.__get__(node)
-            node.should_rm_dirs = True
-
         cmd_list = [
             'catchup',
             '--backup-mode={0}'.format(backup_mode),
             '--catchup-source-pgdata={0}'.format(source_pgdata),
-            '--catchup-destination-pgdata={0}'.format(node.data_dir)
+            '--catchup-destination-pgdata={0}'.format(destination_node.data_dir)
         ]
 
         if self.remote:
             cmd_list += ['--remote-proto=ssh', '--remote-host=localhost']
 
         self.run_pb(cmd_list + options)
 
-        node.append_conf(port=node.port)
-        return node
+        destination_node.append_conf(port=destination_node.port)
+        return destination_node
 
     def show_pb(
             self, backup_dir, instance=None, backup_id=None,