May 3, 2023 · Apr 10, 2023 · Apr 11, 2023 · Apr 11, 2023 · Apr 17, 2023 · Apr 28, 2023
diff --git a/testgres/node.py b/testgres/node.py
 InternalError = pglib.InternalError
 ProgrammingError = pglib.ProgrammingError
 OperationalError = pglib.OperationalError
 DatabaseError = pglib.DatabaseError


 class ProcessProxy(object):

        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
            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):
        """
        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.

            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().


        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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -105,7 +105,6 @@
		InternalError = pglib.InternalError
		ProgrammingError = pglib.ProgrammingError
		OperationalError = pglib.OperationalError
		DatabaseError = pglib.DatabaseError


		class ProcessProxy(object):
Expand DownExpand Up		@@ -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
Expand All		@@ -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):
		"""
Expand DownExpand Up		@@ -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.

Expand All		@@ -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().

Expand All		@@ -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

Expand Down