Aug 16, 2025 · Aug 16, 2025 · Aug 16, 2025 · Sep 10, 2025 · Sep 10, 2025 · Sep 14, 2025
diff --git a/create_py_env.sh b/create_py_env.sh
 pip install pytest-xdist
 pip install psycopg2
 pip install six
 pip install psutil
 pip install psutil
 pip install git+https://git.postgrespro.ru/d.kovalenko/preview-testgres.os_ops.git

diff --git a/setup.py b/setup.py
 if sys.version_info < (3, 3):
    install_requires.append("ipaddress")

 install_requires.append(
    "git+https://git.postgrespro.ru/d.kovalenko/preview-testgres.os_ops.git"
 )

 # Get contents of README file
 with open('README.md', 'r') as f:
    readme = f.read()

 setup(
    version='1.11.0',
    name='testgres',
    packages=['testgres', 'testgres.operations', 'testgres.impl'],
    packages=['testgres', 'testgres.impl'],
    package_dir={"testgres": "src"},
    description='Testing utility for PostgreSQL and its extensions',
    url='https://github.com/postgrespro/testgres',
diff --git a/src/__init__.py b/src/__init__.py

 from .config import testgres_config

 from .operations.os_ops import OsOperations, ConnectionParams
 from .operations.local_ops import LocalOperations
 from .operations.remote_ops import RemoteOperations
 fromtestgres.operations.os_ops import OsOperations, ConnectionParams
 fromtestgres.operations.local_ops import LocalOperations
 fromtestgres.operations.remote_ops import RemoteOperations

 __all__ = [
    "get_new_node",
diff --git a/src/backup.py b/src/backup.py

 from .exceptions import BackupException

 from .operations.os_ops import OsOperations
 fromtestgres.operations.os_ops import OsOperations

 from .utils import \
    get_bin_path2, \
diff --git a/src/cache.py b/src/cache.py
    get_bin_path2, \
    execute_utility2

 from .operations.local_ops import LocalOperations
 from .operations.os_ops import OsOperations
 fromtestgres.operations.local_ops import LocalOperations
 fromtestgres.operations.os_ops import OsOperations


 def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = None, bin_path=None, cached=True):
diff --git a/src/config.py b/src/config.py
 from contextlib import contextmanager

 from .consts import TMP_CACHE
 from .operations.os_ops import OsOperations
 from .operations.local_ops import LocalOperations
 fromtestgres.operations.os_ops import OsOperations
 fromtestgres.operations.local_ops import LocalOperations

 log_level = os.getenv('LOGGING_LEVEL', 'WARNING').upper()
 log_format = os.getenv('LOGGING_FORMAT', '%(asctime)s - %(levelname)s - %(message)s')
diff --git a/src/exceptions.py b/src/exceptions.py

 import six


 class TestgresException(Exception):
    pass
 from testgres.operations.exceptions import TestgresException
 from testgres.operations.exceptions import ExecUtilException
 from testgres.operations.exceptions import InvalidOperationException


 class PortForException(TestgresException):
    pass


 @six.python_2_unicode_compatible
 class ExecUtilException(TestgresException):
    def __init__(self, message=None, command=None, exit_code=0, out=None, error=None):
        super(ExecUtilException, self).__init__(message)

        self.message = message
        self.command = command
        self.exit_code = exit_code
        self.out = out
        self.error = error

    def __str__(self):
        msg = []

        if self.message:
            msg.append(self.message)

        if self.command:
            command_s = ' '.join(self.command) if isinstance(self.command, list) else self.command,
            msg.append(u'Command: {}'.format(command_s))

        if self.exit_code:
            msg.append(u'Exit code: {}'.format(self.exit_code))

        if self.error:
            msg.append(u'---- Error:\n{}'.format(self.error))

        if self.out:
            msg.append(u'---- Out:\n{}'.format(self.out))

        return self.convert_and_join(msg)

    @staticmethod
    def convert_and_join(msg_list):
        # Convert each byte element in the list to str
        str_list = [six.text_type(item, 'utf-8') if isinstance(item, bytes) else six.text_type(item) for item in
                    msg_list]

        # Join the list into a single string with the specified delimiter
        return six.text_type('\n').join(str_list)


 @six.python_2_unicode_compatible
 class QueryException(TestgresException):
    def __init__(self, message=None, query=None):
    pass


 class InvalidOperationException(TestgresException):
    pass
 assert ExecUtilException.__name__ == "ExecUtilException"
 assert InvalidOperationException.__name__ == "InvalidOperationException"
diff --git a/src/impl/port_manager__generic.py b/src/impl/port_manager__generic.py
 from..operations.os_ops import OsOperations
 fromtestgres.operations.os_ops import OsOperations

 from ..port_manager import PortManager
 from ..exceptions import PortForException
diff --git a/src/node.py b/src/node.py

 from .backup import NodeBackup

 from .operations.os_ops import ConnectionParams
 from .operations.os_ops import OsOperations
 from .operations.local_ops import LocalOperations
 fromtestgres.operations.os_ops import ConnectionParams
 fromtestgres.operations.os_ops import OsOperations
 fromtestgres.operations.local_ops import LocalOperations

 InternalError = pglib.InternalError
 ProgrammingError = pglib.ProgrammingError
diff --git a/src/operations/__init__.py b/src/operations/__init__.py
diff --git a/src/operations/helpers.py b/src/operations/helpers.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,6 @@ pip install pytest
		pip install pytest-xdist
		pip install psycopg2
		pip install six
		pip install psutil
		pip install psutil
		pip install git+https://git.postgrespro.ru/d.kovalenko/preview-testgres.os_ops.git
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,14 +22,18 @@
		if sys.version_info < (3, 3):
		install_requires.append("ipaddress")

		install_requires.append(
		"git+https://git.postgrespro.ru/d.kovalenko/preview-testgres.os_ops.git"
		)

		# Get contents of README file
		with open('README.md', 'r') as f:
		readme = f.read()

		setup(
		version='1.11.0',
		name='testgres',
		packages=['testgres', 'testgres.operations', 'testgres.impl'],
		packages=['testgres', 'testgres.impl'],
		package_dir={"testgres": "src"},
		description='Testing utility for PostgreSQL and its extensions',
		url='https://github.com/postgrespro/testgres',
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,9 +51,9 @@

		from .config import testgres_config

		from .operations.os_ops import OsOperations, ConnectionParams
		from .operations.local_ops import LocalOperations
		from .operations.remote_ops import RemoteOperations
		fromtestgres.operations.os_ops import OsOperations, ConnectionParams
		fromtestgres.operations.local_ops import LocalOperations
		fromtestgres.operations.remote_ops import RemoteOperations

		__all__ = [
		"get_new_node",
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,7 +13,7 @@

		from .exceptions import BackupException

		from .operations.os_ops import OsOperations
		fromtestgres.operations.os_ops import OsOperations

		from .utils import \
		get_bin_path2, \
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,8 +16,8 @@
		get_bin_path2, \
		execute_utility2

		from .operations.local_ops import LocalOperations
		from .operations.os_ops import OsOperations
		fromtestgres.operations.local_ops import LocalOperations
		fromtestgres.operations.os_ops import OsOperations


		def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = None, bin_path=None, cached=True):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,8 +9,8 @@
		from contextlib import contextmanager

		from .consts import TMP_CACHE
		from .operations.os_ops import OsOperations
		from .operations.local_ops import LocalOperations
		fromtestgres.operations.os_ops import OsOperations
		fromtestgres.operations.local_ops import LocalOperations

		log_level = os.getenv('LOGGING_LEVEL', 'WARNING').upper()
		log_format = os.getenv('LOGGING_FORMAT', '%(asctime)s - %(levelname)s - %(message)s')
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,57 +2,15 @@

		import six


		class TestgresException(Exception):
		pass
		from testgres.operations.exceptions import TestgresException
		from testgres.operations.exceptions import ExecUtilException
		from testgres.operations.exceptions import InvalidOperationException


		class PortForException(TestgresException):
		pass


		@six.python_2_unicode_compatible
		class ExecUtilException(TestgresException):
		def __init__(self, message=None, command=None, exit_code=0, out=None, error=None):
		super(ExecUtilException, self).__init__(message)

		self.message = message
		self.command = command
		self.exit_code = exit_code
		self.out = out
		self.error = error

		def __str__(self):
		msg = []

		if self.message:
		msg.append(self.message)

		if self.command:
		command_s = ' '.join(self.command) if isinstance(self.command, list) else self.command,
		msg.append(u'Command: {}'.format(command_s))

		if self.exit_code:
		msg.append(u'Exit code: {}'.format(self.exit_code))

		if self.error:
		msg.append(u'---- Error:\n{}'.format(self.error))

		if self.out:
		msg.append(u'---- Out:\n{}'.format(self.out))

		return self.convert_and_join(msg)

		@staticmethod
		def convert_and_join(msg_list):
		# Convert each byte element in the list to str
		str_list = [six.text_type(item, 'utf-8') if isinstance(item, bytes) else six.text_type(item) for item in
		msg_list]

		# Join the list into a single string with the specified delimiter
		return six.text_type('\n').join(str_list)


		@six.python_2_unicode_compatible
		class QueryException(TestgresException):
		def __init__(self, message=None, query=None):
Expand DownExpand Up		@@ -109,5 +67,5 @@ class BackupException(TestgresException):
		pass


		class InvalidOperationException(TestgresException):
		pass
		assert ExecUtilException.__name__ == "ExecUtilException"
		assert InvalidOperationException.__name__ == "InvalidOperationException"
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		from..operations.os_ops import OsOperations
		fromtestgres.operations.os_ops import OsOperations

		from ..port_manager import PortManager
		from ..exceptions import PortForException
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -104,9 +104,9 @@

		from .backup import NodeBackup

		from .operations.os_ops import ConnectionParams
		from .operations.os_ops import OsOperations
		from .operations.local_ops import LocalOperations
		fromtestgres.operations.os_ops import ConnectionParams
		fromtestgres.operations.os_ops import OsOperations
		fromtestgres.operations.local_ops import LocalOperations

		InternalError = pglib.InternalError
		ProgrammingError = pglib.ProgrammingError
Expand Down