tests: to pgdata_content() and add_instance() arbitrary cmdline options can now be provided

gsmolk · gsmolk · commit 1dbc0c94df92 · 2019-01-16T16:31:26.000+03:00
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -615,16 +615,16 @@ def init_pb(self, backup_dir, old_binary=False):
             old_binary=old_binary
         )
 
-    def add_instance(self, backup_dir, instance, node, old_binary=False):
+    def add_instance(self, backup_dir, instance, node, old_binary=False, options=[]):
 
-        return self.run_pb([
+        cmd = [
             'add-instance',
             '--instance={0}'.format(instance),
             '-B', backup_dir,
             '-D', node.data_dir
-            ],
-            old_binary=old_binary
-        )
+            ]
+
+        return self.run_pb(cmd + options, old_binary=old_binary)
 
     def del_instance(self, backup_dir, instance, old_binary=False):
 
@@ -1049,7 +1049,7 @@ def del_test_dir(self, module_name, fname):
         except:
             pass
 
-    def pgdata_content(self, pgdata, ignore_ptrack=True):
+    def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):
         """ return dict with directory content. "
         " TAKE IT AFTER CHECKPOINT or BACKUP"""
         dirs_to_ignore = [
@@ -1062,6 +1062,9 @@ def pgdata_content(self, pgdata, ignore_ptrack=True):
             'backup_label', 'tablespace_map', 'recovery.conf',
             'ptrack_control', 'ptrack_init', 'pg_control'
         ]
+
+        if exclude_dirs:
+            dirs_to_ignore = dirs_to_ignore + exclude_dirs
 #        suffixes_to_ignore = (
 #            '_ptrack'
 #        )
