Aug 16, 2025 · Aug 16, 2025 · Aug 16, 2025 · Sep 10, 2025 · Sep 10, 2025 · Sep 14, 2025
diff --git a/.vscode/settings.json b/.vscode/settings.json
 {
    "python.testing.unittestEnabled": false,
    "python.testing.pytestEnabled": true,

    "python.testing.pytestArgs": [
        "-l",
        "-vvv",
        "-n", "8"
    ],
 }
diff --git a/create_py_env.sh b/create_py_env.sh
 virtualenv venv
 source venv/bin/activate
 # pip install -U .
 pip install flake8
 pip install pytest
 pip install pytest-xdist
 pip install psycopg2
 pip install six
 pip install psutil
diff --git a/init_test_env.sh b/init_test_env.sh
 export PG_BIN='/usr/local/pgsql/bin'
 export PG_CONFIG=${PG_BIN}/pg_config
 #export PGPROBACKUPBIN="/home/dima/MY/GitLab2/pg_probackup2/ee/work5/pg_probackup"
 export PATH=${PATH}:${PG_BIN}

diff --git a/run_vscode.sh b/run_vscode.sh
 source ./init_test_env.sh

 code .

diff --git a/setup.py b/setup.py
    version='1.11.0',
    name='testgres',
    packages=['testgres', 'testgres.operations', 'testgres.impl'],
    package_dir={"testgres": "src"},
    description='Testing utility for PostgreSQL and its extensions',
    url='https://github.com/postgrespro/testgres',
    long_description=readme,
diff --git a/testgres/__init__.py → src/__init__.py b/testgres/__init__.py → src/__init__.py
diff --git a/testgres/api.py → src/api.py b/testgres/api.py → src/api.py
diff --git a/testgres/backup.py → src/backup.py b/testgres/backup.py → src/backup.py
diff --git a/testgres/cache.py → src/cache.py b/testgres/cache.py → src/cache.py
diff --git a/testgres/config.py → src/config.py b/testgres/config.py → src/config.py
diff --git a/testgres/connection.py → src/connection.py b/testgres/connection.py → src/connection.py
diff --git a/testgres/consts.py → src/consts.py b/testgres/consts.py → src/consts.py
diff --git a/testgres/decorators.py → src/decorators.py b/testgres/decorators.py → src/decorators.py
diff --git a/testgres/defaults.py → src/defaults.py b/testgres/defaults.py → src/defaults.py
diff --git a/testgres/enums.py → src/enums.py b/testgres/enums.py → src/enums.py
diff --git a/testgres/exceptions.py → src/exceptions.py b/testgres/exceptions.py → src/exceptions.py
diff --git a/testgres/impl/port_manager__generic.py → src/impl/port_manager__generic.py b/testgres/impl/port_manager__generic.py → src/impl/port_manager__generic.py
diff --git a/testgres/impl/port_manager__this_host.py → src/impl/port_manager__this_host.py b/testgres/impl/port_manager__this_host.py → src/impl/port_manager__this_host.py
diff --git a/testgres/logger.py → src/logger.py b/testgres/logger.py → src/logger.py
diff --git a/testgres/node.py → src/node.py b/testgres/node.py → src/node.py
diff --git a/testgres/node_app.py → src/node_app.py b/testgres/node_app.py → src/node_app.py
diff --git a/testgres/operations/__init__.py → src/operations/__init__.py b/testgres/operations/__init__.py → src/operations/__init__.py
diff --git a/testgres/operations/helpers.py → src/operations/helpers.py b/testgres/operations/helpers.py → src/operations/helpers.py
diff --git a/testgres/operations/local_ops.py → src/operations/local_ops.py b/testgres/operations/local_ops.py → src/operations/local_ops.py
diff --git a/testgres/operations/os_ops.py → src/operations/os_ops.py b/testgres/operations/os_ops.py → src/operations/os_ops.py
diff --git a/testgres/operations/raise_error.py → src/operations/raise_error.py b/testgres/operations/raise_error.py → src/operations/raise_error.py
diff --git a/testgres/operations/remote_ops.py → src/operations/remote_ops.py b/testgres/operations/remote_ops.py → src/operations/remote_ops.py
diff --git a/testgres/plugins/__init__.py → src/plugins/__init__.py b/testgres/plugins/__init__.py → src/plugins/__init__.py
diff --git a/testgres/plugins/pg_probackup2/README.md → src/plugins/pg_probackup2/README.md b/testgres/plugins/pg_probackup2/README.md → src/plugins/pg_probackup2/README.md
diff --git a/testgres/plugins/pg_probackup2/__init__.py → src/plugins/pg_probackup2/__init__.py b/testgres/plugins/pg_probackup2/__init__.py → src/plugins/pg_probackup2/__init__.py
diff --git a/...s/pg_probackup2/pg_probackup2/__init__.py → ...s/pg_probackup2/pg_probackup2/__init__.py b/...s/pg_probackup2/pg_probackup2/__init__.py → ...s/pg_probackup2/pg_probackup2/__init__.py
diff --git a/...lugins/pg_probackup2/pg_probackup2/app.py → ...lugins/pg_probackup2/pg_probackup2/app.py b/...lugins/pg_probackup2/pg_probackup2/app.py → ...lugins/pg_probackup2/pg_probackup2/app.py
diff --git a/...lugins/pg_probackup2/pg_probackup2/gdb.py → ...lugins/pg_probackup2/pg_probackup2/gdb.py b/...lugins/pg_probackup2/pg_probackup2/gdb.py → ...lugins/pg_probackup2/pg_probackup2/gdb.py
diff --git a/..._probackup2/pg_probackup2/init_helpers.py → ..._probackup2/pg_probackup2/init_helpers.py b/..._probackup2/pg_probackup2/init_helpers.py → ..._probackup2/pg_probackup2/init_helpers.py
diff --git a/...backup2/pg_probackup2/storage/__init__.py → ...backup2/pg_probackup2/storage/__init__.py b/...backup2/pg_probackup2/storage/__init__.py → ...backup2/pg_probackup2/storage/__init__.py
diff --git a/...ackup2/pg_probackup2/storage/fs_backup.py → ...ackup2/pg_probackup2/storage/fs_backup.py b/...ackup2/pg_probackup2/storage/fs_backup.py → ...ackup2/pg_probackup2/storage/fs_backup.py
diff --git a/...robackup2/pg_probackup2/tests/__init__.py → ...robackup2/pg_probackup2/tests/__init__.py b/...robackup2/pg_probackup2/tests/__init__.py → ...robackup2/pg_probackup2/tests/__init__.py
diff --git a/...backup2/pg_probackup2/tests/test_basic.py → ...backup2/pg_probackup2/tests/test_basic.py b/...backup2/pg_probackup2/tests/test_basic.py → ...backup2/pg_probackup2/tests/test_basic.py
diff --git a/testgres/plugins/pg_probackup2/setup.py → src/plugins/pg_probackup2/setup.py b/testgres/plugins/pg_probackup2/setup.py → src/plugins/pg_probackup2/setup.py
diff --git a/testgres/port_manager.py → src/port_manager.py b/testgres/port_manager.py → src/port_manager.py
diff --git a/testgres/pubsub.py → src/pubsub.py b/testgres/pubsub.py → src/pubsub.py
diff --git a/testgres/standby.py → src/standby.py b/testgres/standby.py → src/standby.py
diff --git a/testgres/utils.py → src/utils.py b/testgres/utils.py → src/utils.py
diff --git a/tests/helpers/global_data.py b/tests/helpers/global_data.py
 fromtestgres.operations.os_ops import OsOperations
 fromtestgres.operations.os_ops import ConnectionParams
 fromtestgres.operations.local_ops import LocalOperations
 fromtestgres.operations.remote_ops import RemoteOperations

 fromtestgres.node import PortManager
 fromtestgres.node import PortManager__ThisHost
 fromtestgres.node import PortManager__Generic
 fromsrc.operations.os_ops import OsOperations
 fromsrc.operations.os_ops import ConnectionParams
 fromsrc.operations.local_ops import LocalOperations
 fromsrc.operations.remote_ops import RemoteOperations

 fromsrc.node import PortManager
 fromsrc.node import PortManager__ThisHost
 fromsrc.node import PortManager__Generic

 import os

diff --git a/tests/test_config.py b/tests/test_config.py
 fromtestgres import TestgresConfig
 fromtestgres import configure_testgres
 fromtestgres import scoped_config
 fromtestgres import pop_config
 fromsrc import TestgresConfig
 fromsrc import configure_testgres
 fromsrc import scoped_config
 fromsrc import pop_config

 import testgres
 importsrc astestgres

 import pytest

diff --git a/tests/test_os_ops_common.py b/tests/test_os_ops_common.py
 import typing
 import uuid

 fromtestgres import InvalidOperationException
 fromtestgres import ExecUtilException
 fromsrc import InvalidOperationException
 fromsrc import ExecUtilException

 from concurrent.futures import ThreadPoolExecutor
 from concurrent.futures import Future as ThreadFuture
diff --git a/tests/test_os_ops_remote.py b/tests/test_os_ops_remote.py
 from .helpers.global_data import OsOpsDescrs
 from .helpers.global_data import OsOperations

 fromtestgres import ExecUtilException
 fromsrc import ExecUtilException

 import os
 import pytest
diff --git a/tests/test_testgres_common.py b/tests/test_testgres_common.py
 from .helpers.global_data import OsOperations
 from .helpers.global_data import PortManager

 fromtestgres.node import PgVer
 fromtestgres.node import PostgresNode
 fromtestgres.node import PostgresNodeLogReader
 fromtestgres.node import PostgresNodeUtils
 fromtestgres.utils import get_pg_version2
 fromtestgres.utils import file_tail
 fromtestgres.utils import get_bin_path2
 fromtestgres import ProcessType
 fromtestgres import NodeStatus
 fromtestgres import IsolationLevel
 fromtestgres import NodeApp
 fromsrc.node import PgVer
 fromsrc.node import PostgresNode
 fromsrc.node import PostgresNodeLogReader
 fromsrc.node import PostgresNodeUtils
 fromsrc.utils import get_pg_version2
 fromsrc.utils import file_tail
 fromsrc.utils import get_bin_path2
 fromsrc import ProcessType
 fromsrc import NodeStatus
 fromsrc import IsolationLevel
 fromsrc import NodeApp

 # New name prevents to collect test-functions in TestgresException and fixes
 # the problem with pytest warning.
 fromtestgres import TestgresException as testgres_TestgresException

 fromtestgres import InitNodeException
 fromtestgres import StartNodeException
 fromtestgres import QueryException
 fromtestgres import ExecUtilException
 fromtestgres import TimeoutException
 fromtestgres import InvalidOperationException
 fromtestgres import BackupException
 fromtestgres import ProgrammingError
 fromtestgres import scoped_config
 fromtestgres import First, Any
 fromsrc import TestgresException as testgres_TestgresException

 fromsrc import InitNodeException
 fromsrc import StartNodeException
 fromsrc import QueryException
 fromsrc import ExecUtilException
 fromsrc import TimeoutException
 fromsrc import InvalidOperationException
 fromsrc import BackupException
 fromsrc import ProgrammingError
 fromsrc import scoped_config
 fromsrc import First, Any

 from contextlib import contextmanager

diff --git a/tests/test_testgres_local.py b/tests/test_testgres_local.py
 import platform
 import logging

 import testgres
 importsrc astestgres

 fromtestgres import StartNodeException
 fromtestgres import ExecUtilException
 fromtestgres import NodeApp
 fromtestgres import scoped_config
 fromtestgres import get_new_node
 fromtestgres import get_bin_path
 fromtestgres import get_pg_config
 fromtestgres import get_pg_version
 fromsrc import StartNodeException
 fromsrc import ExecUtilException
 fromsrc import NodeApp
 fromsrc import scoped_config
 fromsrc import get_new_node
 fromsrc import get_bin_path
 fromsrc import get_pg_config
 fromsrc import get_pg_version

 # NOTE: those are ugly imports
 fromtestgres.utils import bound_ports
 fromtestgres.utils import PgVer
 fromtestgres.node import ProcessProxy
 fromsrc.utils import bound_ports
 fromsrc.utils import PgVer
 fromsrc.node import ProcessProxy


 def pg_version_ge(version):
diff --git a/tests/test_testgres_remote.py b/tests/test_testgres_remote.py
 from .helpers.global_data import PostgresNodeService
 from .helpers.global_data import PostgresNodeServices

 import testgres
 importsrc astestgres

 fromtestgres.exceptions import InitNodeException
 fromtestgres.exceptions import ExecUtilException
 fromsrc.exceptions import InitNodeException
 fromsrc.exceptions import ExecUtilException

 fromtestgres.config import scoped_config
 fromtestgres.config import testgres_config
 fromsrc.config import scoped_config
 fromsrc.config import testgres_config

 fromtestgres import get_bin_path
 fromtestgres import get_pg_config
 fromsrc import get_bin_path
 fromsrc import get_pg_config

 # NOTE: those are ugly imports

diff --git a/tests/test_utils.py b/tests/test_utils.py
 from .helpers.global_data import OsOpsDescrs
 from .helpers.global_data import OsOperations

 fromtestgres.utils import parse_pg_version
 fromtestgres.utils import get_pg_config2
 fromtestgres import scoped_config
 fromsrc.utils import parse_pg_version
 fromsrc.utils import get_pg_config2
 fromsrc import scoped_config

 import pytest
 import typing
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,10 @@
		{
		"python.testing.unittestEnabled": false,
		"python.testing.pytestEnabled": true,

		"python.testing.pytestArgs": [
		"-l",
		"-vvv",
		"-n", "8"
		],
		}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		virtualenv venv
		source venv/bin/activate
		# pip install -U .
		pip install flake8
		pip install pytest
		pip install pytest-xdist
		pip install psycopg2
		pip install six
		pip install psutil
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		export PG_BIN='/usr/local/pgsql/bin'
		export PG_CONFIG=${PG_BIN}/pg_config
		#export PGPROBACKUPBIN="/home/dima/MY/GitLab2/pg_probackup2/ee/work5/pg_probackup"
		export PATH=${PATH}:${PG_BIN}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,6 +30,7 @@
		version='1.11.0',
		name='testgres',
		packages=['testgres', 'testgres.operations', 'testgres.impl'],
		package_dir={"testgres": "src"},
		description='Testing utility for PostgreSQL and its extensions',
		url='https://github.com/postgrespro/testgres',
		long_description=readme,
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,11 +1,11 @@
		fromtestgres.operations.os_ops import OsOperations
		fromtestgres.operations.os_ops import ConnectionParams
		fromtestgres.operations.local_ops import LocalOperations
		fromtestgres.operations.remote_ops import RemoteOperations

		fromtestgres.node import PortManager
		fromtestgres.node import PortManager__ThisHost
		fromtestgres.node import PortManager__Generic
		fromsrc.operations.os_ops import OsOperations
		fromsrc.operations.os_ops import ConnectionParams
		fromsrc.operations.local_ops import LocalOperations
		fromsrc.operations.remote_ops import RemoteOperations

		fromsrc.node import PortManager
		fromsrc.node import PortManager__ThisHost
		fromsrc.node import PortManager__Generic

		import os

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,9 +1,9 @@
		fromtestgres import TestgresConfig
		fromtestgres import configure_testgres
		fromtestgres import scoped_config
		fromtestgres import pop_config
		fromsrc import TestgresConfig
		fromsrc import configure_testgres
		fromsrc import scoped_config
		fromsrc import pop_config

		import testgres
		importsrc astestgres

		import pytest

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,8 +15,8 @@
		import typing
		import uuid

		fromtestgres import InvalidOperationException
		fromtestgres import ExecUtilException
		fromsrc import InvalidOperationException
		fromsrc import ExecUtilException

		from concurrent.futures import ThreadPoolExecutor
		from concurrent.futures import Future as ThreadFuture
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,7 +3,7 @@
		from .helpers.global_data import OsOpsDescrs
		from .helpers.global_data import OsOperations

		fromtestgres import ExecUtilException
		fromsrc import ExecUtilException

		import os
		import pytest
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,32 +5,32 @@
		from .helpers.global_data import OsOperations
		from .helpers.global_data import PortManager

		fromtestgres.node import PgVer
		fromtestgres.node import PostgresNode
		fromtestgres.node import PostgresNodeLogReader
		fromtestgres.node import PostgresNodeUtils
		fromtestgres.utils import get_pg_version2
		fromtestgres.utils import file_tail
		fromtestgres.utils import get_bin_path2
		fromtestgres import ProcessType
		fromtestgres import NodeStatus
		fromtestgres import IsolationLevel
		fromtestgres import NodeApp
		fromsrc.node import PgVer
		fromsrc.node import PostgresNode
		fromsrc.node import PostgresNodeLogReader
		fromsrc.node import PostgresNodeUtils
		fromsrc.utils import get_pg_version2
		fromsrc.utils import file_tail
		fromsrc.utils import get_bin_path2
		fromsrc import ProcessType
		fromsrc import NodeStatus
		fromsrc import IsolationLevel
		fromsrc import NodeApp

		# New name prevents to collect test-functions in TestgresException and fixes
		# the problem with pytest warning.
		fromtestgres import TestgresException as testgres_TestgresException

		fromtestgres import InitNodeException
		fromtestgres import StartNodeException
		fromtestgres import QueryException
		fromtestgres import ExecUtilException
		fromtestgres import TimeoutException
		fromtestgres import InvalidOperationException
		fromtestgres import BackupException
		fromtestgres import ProgrammingError
		fromtestgres import scoped_config
		fromtestgres import First, Any
		fromsrc import TestgresException as testgres_TestgresException

		fromsrc import InitNodeException
		fromsrc import StartNodeException
		fromsrc import QueryException
		fromsrc import ExecUtilException
		fromsrc import TimeoutException
		fromsrc import InvalidOperationException
		fromsrc import BackupException
		fromsrc import ProgrammingError
		fromsrc import scoped_config
		fromsrc import First, Any

		from contextlib import contextmanager

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,21 +7,21 @@
		import platform
		import logging

		import testgres
		importsrc astestgres

		fromtestgres import StartNodeException
		fromtestgres import ExecUtilException
		fromtestgres import NodeApp
		fromtestgres import scoped_config
		fromtestgres import get_new_node
		fromtestgres import get_bin_path
		fromtestgres import get_pg_config
		fromtestgres import get_pg_version
		fromsrc import StartNodeException
		fromsrc import ExecUtilException
		fromsrc import NodeApp
		fromsrc import scoped_config
		fromsrc import get_new_node
		fromsrc import get_bin_path
		fromsrc import get_pg_config
		fromsrc import get_pg_version

		# NOTE: those are ugly imports
		fromtestgres.utils import bound_ports
		fromtestgres.utils import PgVer
		fromtestgres.node import ProcessProxy
		fromsrc.utils import bound_ports
		fromsrc.utils import PgVer
		fromsrc.node import ProcessProxy


		def pg_version_ge(version):
Expand Down