testgres-pg-probackup2 0.2.2__tar.gz → 0.4.0__tar.gz

{testgres_pg_probackup2-0.2.2 → testgres_pg_probackup2-0.4.0}/PKG-INFO

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

{testgres_pg_probackup2-0.2.2 → testgres_pg_probackup2-0.4.0}/pg_probackup2/app.py

@@ -64,7 +64,10 @@ class ProbackupApp:
         self.valgrind_sup_path = init_params.valgrind_sup_path
 
     def form_daemon_process(self, cmdline, env):
-        def stream_output(stream: subprocess.PIPE) -> None:
+        if self.test_class.output is None:
+            self.test_class.output = str()
+
+        def stream_output(stream) -> None:
             try:
                 for line in iter(stream.readline, ''):
                     print(line)
@@ -82,11 +85,11 @@ class ProbackupApp:
         logging.info(f"Process started in background with PID: {self.process.pid}")
 
         if self.process.stdout and self.process.stderr:
-            stdout_thread = threading.Thread(target=stream_output, args=(self.process.stdout,), daemon=True)
-            stderr_thread = threading.Thread(target=stream_output, args=(self.process.stderr,), daemon=True)
+            self.stdout_thread = threading.Thread(target=stream_output, args=(self.process.stdout,), daemon=True)
+            self.stderr_thread = threading.Thread(target=stream_output, args=(self.process.stderr,), daemon=True)
 
-            stdout_thread.start()
-            stderr_thread.start()
+            self.stdout_thread.start()
+            self.stderr_thread.start()
 
         return self.process.pid
 
@@ -195,7 +198,14 @@ class ProbackupApp:
             # Execute command
             start_time = time.time()
             if daemonize:
-                return self.form_daemon_process(cmdline, env)
+                pid = self.form_daemon_process(cmdline, env)
+                if expect_error:
+                    _timeout = 120
+                    if self.stdout_thread:
+                        self.stdout_thread.join(_timeout)
+                    if self.stderr_thread:
+                        self.stderr_thread.join(_timeout)
+                return pid
             else:
                 self.test_class.output = subprocess.check_output(
                     cmdline,
@@ -561,7 +571,7 @@ class ProbackupApp:
                         backup_list.append(backup)
 
             if backup_id is not None:
-                assert False, "Failed to find backup with ID: {0}".format(backup_id)
+                raise RuntimeError("Failed to find backup with ID: {0}".format(backup_id))
 
             return backup_list
         else:
@@ -619,7 +629,7 @@ class ProbackupApp:
                     specific_record[name.strip()] = var
 
                 if not specific_record:
-                    assert False, "Failed to find backup with ID: {0}".format(backup_id)
+                    raise RuntimeError("Failed to find backup with ID: {0}".format(backup_id))
 
                 return specific_record
 
@@ -768,6 +778,13 @@ class ProbackupApp:
             log_level=False, archive_timeout=False,
             custom_archive_command=None):
 
+        # check instance existing
+        instances_json = self.show(instance=None, as_json=True, expect_error=False, as_text=True)
+        instances_data = json.loads(instances_json)
+        if not any(inst_data.get('instance') == instance for inst_data in instances_data):
+            raise RuntimeError("Instance '{0}' does not exist. " \
+                          "Please add the instance first using add_instance() or init_pb_node().".format(instance))
+
         # parse postgresql.auto.conf
         options = {}
         if replica:

{testgres_pg_probackup2-0.2.2 → testgres_pg_probackup2-0.4.0}/setup.py

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

{testgres_pg_probackup2-0.2.2 → testgres_pg_probackup2-0.4.0}/testgres_pg_probackup2.egg-info/PKG-INFO

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