testgres-pg-probackup2 0.2.1__tar.gz → 0.3.0__tar.gz

{testgres_pg_probackup2-0.2.1 → testgres_pg_probackup2-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: testgres_pg_probackup2
-Version: 0.2.1
+Version: 0.3.0
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -8,3 +8,12 @@ Author-email: testgres@postgrespro.ru
 License: PostgreSQL
 Keywords: pg_probackup,testing,testgres
 Description-Content-Type: text/markdown
+Requires-Dist: testgres>=1.9.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary

{testgres_pg_probackup2-0.2.1 → testgres_pg_probackup2-0.3.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,
@@ -492,10 +502,16 @@ class ProbackupApp:
             if remote_port:
                 cmd_list.append(f'--remote-port={remote_port}')
         if self.verbose:
-            cmd_list += [
-                '--log-level-file=VERBOSE',
-                '--log-directory={0}'.format(destination_node.logs_dir)
-            ]
+            if init_params.major_version > 2:
+                cmd_list += [
+                    '--log-level-file=trace',
+                    '--log-directory={0}'.format(destination_node.logs_dir)
+                ]
+            else:
+                cmd_list += [
+                    '--log-level-file=VERBOSE',
+                    '--log-directory={0}'.format(destination_node.logs_dir)
+                ]
 
         return self.run(cmd_list + options, gdb=gdb, expect_error=expect_error, use_backup_dir=False)
 

{testgres_pg_probackup2-0.2.1 → testgres_pg_probackup2-0.3.0}/setup.py

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

{testgres_pg_probackup2-0.2.1 → testgres_pg_probackup2-0.3.0}/testgres_pg_probackup2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: testgres-pg-probackup2
-Version: 0.2.1
+Metadata-Version: 2.4
+Name: testgres_pg_probackup2
+Version: 0.3.0
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -8,3 +8,12 @@ Author-email: testgres@postgrespro.ru
 License: PostgreSQL
 Keywords: pg_probackup,testing,testgres
 Description-Content-Type: text/markdown
+Requires-Dist: testgres>=1.9.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary