PBCKP-137 update node

v.shepard · v.shepard · commit d01804b88398 · 2023-04-17T13:47:37.000+02:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -105,7 +105,6 @@
 InternalError = pglib.InternalError
 ProgrammingError = pglib.ProgrammingError
 OperationalError = pglib.OperationalError
-DatabaseError = pglib.DatabaseError
 
 
 class ProcessProxy(object):
@@ -653,7 +652,7 @@ def get_control_data(self):
 
         return out_dict
 
-    def slow_start(self, replica=False, dbname='template1', username='dev'):
+    def slow_start(self, replica=False, dbname='template1', username=default_username()):
         """
         Starts the PostgreSQL instance and then polls the instance
         until it reaches the expected state (primary or replica). The state is checked
@@ -673,14 +672,12 @@ def slow_start(self, replica=False, dbname='template1', username='dev'):
             query = 'SELECT not pg_is_in_recovery()'
         # Call poll_query_until until the expected value is returned
         self.poll_query_until(query=query,
-                              expected=False,
                               dbname=dbname,
                               username=username,
                               suppress={InternalError,
                                         QueryException,
                                         ProgrammingError,
-                                        OperationalError,
-                                        DatabaseError})
+                                        OperationalError})
 
     def start(self, params=[], wait=True):
         """
@@ -970,7 +967,7 @@ def psql(self,
         return process.returncode, out, err
 
     @method_decorator(positional_args_hack(['dbname', 'query']))
-    def safe_psql(self, query=None, **kwargs):
+    def safe_psql(self, query=None, expect_error=False, **kwargs):
         """
         Execute a query using psql.
 
@@ -980,6 +977,8 @@ def safe_psql(self, query=None, **kwargs):
             dbname: database name to connect to.
             username: database user name.
             input: raw input to be passed.
+            expect_error: if True - fail if we didn't get ret
+                          if False - fail if we got ret
 
             **kwargs are passed to psql().
 
@@ -992,7 +991,12 @@ def safe_psql(self, query=None, **kwargs):
 
         ret, out, err = self.psql(query=query, **kwargs)
         if ret:
-            raise QueryException((err or b'').decode('utf-8'), query)
+            if expect_error:
+                out = (err or b'').decode('utf-8')
+            else:
+                raise QueryException((err or b'').decode('utf-8'), query)
+        elif expect_error:
+            assert False, f"Exception was expected, but query finished successfully: `{query}` "
 
         return out
 
@@ -1139,7 +1143,7 @@ def poll_query_until(self,
                 elif expected is None:
                     return    # done
 
-            except tuple(suppress or []):
+            except tuple(suppress or []) as e:
                 pass    # we're suppressing them
 
             time.sleep(sleep_time)
