tests fix

tests/ptrack_vacuum.py

@@ -1,4 +1,5 @@
 import unittest
+import os
 from sys import exit
 from testgres import get_new_node, stop_all
 from helpers.ptrack_helpers import ProbackupTest, idx_ptrack
@@ -7,6 +8,7 @@ from helpers.ptrack_helpers import ProbackupTest, idx_ptrack
 class SimpleTest(ProbackupTest, unittest.TestCase):
     def __init__(self, *args, **kwargs):
         super(SimpleTest, self).__init__(*args, **kwargs)
+        self.module_name = 'ptrack_vacuum'
 
     def teardown(self):
         # clean_all()
@@ -16,12 +18,15 @@ class SimpleTest(ProbackupTest, unittest.TestCase):
     # @unittest.expectedFailure
     def test_ptrack_vacuum(self):
         fname = self.id().split('.')[3]
-        node = self.make_simple_node(base_dir='tmp_dirs/ptrack/{0}'.format(fname),
+        node = self.make_simple_node(base_dir="{0}/{1}/node".format(self.module_name, fname),
             set_replication=True,
-            initdb_params=['--data-checksums', '-A trust'],
+            initdb_params=['--data-checksums'],
             pg_options={'ptrack_enable': 'on', 'wal_level': 'replica', 'max_wal_senders': '2'})
-
+        backup_dir = os.path.join(self.tmp_path, self.module_name, fname, 'backup')
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, 'node', node)
         node.start()
+
         self.create_tblspace_in_node(node, 'somedata')
 
         # Create table and indexes
@@ -47,8 +52,7 @@ class SimpleTest(ProbackupTest, unittest.TestCase):
                 idx_ptrack[i]['path'], idx_ptrack[i]['old_size'])
 
         # Make full backup to clean every ptrack
-        self.init_pb(node)
-        self.backup_pb(node, backup_type='full', options=['-j100', '--stream'])
+        self.backup_node(backup_dir, 'node', node, options=['-j100', '--stream'])
         for i in idx_ptrack:
             idx_ptrack[i]['ptrack'] = self.get_ptrack_bits_per_page_for_fork(
                 node, idx_ptrack[i]['path'], idx_ptrack[i]['old_size'])
@@ -74,7 +78,6 @@ class SimpleTest(ProbackupTest, unittest.TestCase):
             # compare pages and check ptrack sanity
             self.check_ptrack_sanity(idx_ptrack[i])
 
-        self.clean_pb(node)
         node.stop()
 
 if __name__ == '__main__':