testgres-pg-probackup2 0.0.2__tar.gz → 0.0.3__tar.gz

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testgres_pg_probackup2
-Version: 0.0.2
+Version: 0.0.3
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.3}/pg_probackup2/app.py

@@ -56,6 +56,7 @@ class ProbackupApp:
         self.verbose = init_params.verbose
         self.archive_compress = init_params.archive_compress
         self.test_class.output = None
+        self.execution_time = None
 
     def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
             skip_log_directory=False, expect_error=False, use_backup_dir=True):
@@ -113,16 +114,17 @@ class ProbackupApp:
                 cmdline = ['gdbserver'] + ['localhost:' + str(gdb_port)] + cmdline
                 print("pg_probackup gdb suspended, waiting gdb connection on localhost:{0}".format(gdb_port))
 
+            start_time = time.time()
             self.test_class.output = subprocess.check_output(
                 cmdline,
                 stderr=subprocess.STDOUT,
                 env=env
             ).decode('utf-8', errors='replace')
+            end_time = time.time()
+            self.execution_time = end_time - start_time
+
             if command[0] == 'backup' and return_id:
-                # return backup ID
-                for line in self.test_class.output.splitlines():
-                    if 'INFO: Backup' and 'completed' in line:
-                        result = line.split()[2]
+                result = self.get_backup_id()
             else:
                 result = self.test_class.output
             if expect_error is True:
@@ -139,6 +141,19 @@ class ProbackupApp:
             else:
                 raise ProbackupException(self.test_class.output, self.test_class.cmd)
 
+    def get_backup_id(self):
+        if init_params.major_version > 2:
+            pattern = re.compile(r"Backup (.*) completed successfully.")
+            for line in self.test_class.output.splitlines():
+                match = pattern.search(line)
+                if match:
+                    return match.group(1)
+        else:
+            for line in self.test_class.output.splitlines():
+                if 'INFO: Backup' and 'completed' in line:
+                    return line.split()[2]
+        return None
+
     def init(self, options=None, old_binary=False, skip_log_directory=False, expect_error=False, use_backup_dir=True):
         if options is None:
             options = []
@@ -149,13 +164,19 @@ class ProbackupApp:
                         use_backup_dir=use_backup_dir
                         )
 
-    def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False):
+    def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False, datname=False):
         if options is None:
             options = []
+
+        if not datname:
+            datname = 'postgres'
+
         cmd = [
             'add-instance',
             '--instance={0}'.format(instance),
-            '-D', node.data_dir
+            '-D', node.data_dir,
+            '--pgport', '%i' % node.port,
+            '--pgdatabase', datname
         ]
 
         # don`t forget to kill old_binary after remote ssh release

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.3}/pg_probackup2/init_helpers.py

@@ -204,6 +204,12 @@ class Init(object):
         os.environ["PGAPPNAME"] = "pg_probackup"
         self.delete_logs = delete_logs
 
+        if self.probackup_version.split('.')[0].isdigit():
+            self.major_version = int(self.probackup_version.split('.')[0])
+        else:
+            print('Can\'t process pg_probackup version \"{}\": the major version is expected to be a number'.format(self.probackup_version))
+            sys.exit(1)
+
     def test_env(self):
         return self._test_env.copy()
 

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.3}/setup.py

@@ -4,7 +4,7 @@ except ImportError:
     from distutils.core import setup
 
 setup(
-    version='0.0.2',
+    version='0.0.3',
     name='testgres_pg_probackup2',
     packages=['pg_probackup2', 'pg_probackup2.storage'],
     description='Plugin for testgres that manages pg_probackup2',

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.3}/testgres_pg_probackup2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testgres-pg-probackup2
-Version: 0.0.2
+Version: 0.0.3
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional