Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita868d71

Browse files
author
vshepard
committed
Add testgres.plugins to plugin
1 parent03d8f96 commita868d71

File tree

12 files changed

+31
-12
lines changed

12 files changed

+31
-12
lines changed

‎plugins/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
frompg_probackup2.gdbimportGDBobj
2+
frompg_probackup2.appimportProbackupApp,ProbackupException
3+
frompg_probackup2.init_helpersimportinit_params
4+
frompg_probackup2.storage.fs_backupimportFSTestBackupDir
5+
6+
__all__= [
7+
"ProbackupApp","ProbackupException","init_params","FSTestBackupDir","GDBobj"
8+
]
File renamed without changes.
File renamed without changes.
File renamed without changes.

‎testgres/plugins/probackup/storage/fs_backup.pyrenamed to‎plugins/pg_probackup2/storage/fs_backup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
importos
55
importshutil
66

7-
fromtestgres.plugins.probackup.init_helpersimportinit_params
7+
frompg_probackup2.init_helpersimportinit_params
88

99

1010
classTestBackupDir:

‎plugins/setup.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
try:
2+
fromsetuptoolsimportsetup
3+
exceptImportError:
4+
fromdistutils.coreimportsetup
5+
6+
setup(
7+
version='0.0.1',
8+
name='testgres-pg_probackup2',
9+
packages=['pg_probackup2','pg_probackup2.storage'],
10+
description='Plugin for testgres that manages pg_probackup2',
11+
url='https://github.com/postgrespro/testgres',
12+
long_description_content_type='text/markdown',
13+
license='PostgreSQL',
14+
keywords=['pg_probackup'],
15+
install_requires=['testgres>=1.9.2']
16+
)

‎setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
withopen('README.md','r')asf:
2727
readme=f.read()
2828

29+
2930
setup(
3031
version='1.9.2',
3132
name='testgres',
32-
packages=['testgres','testgres.operations','testgres.plugins.probackup','testgres.plugins.probackup.storage'],
33+
packages=['testgres','testgres.operations'],
3334
description='Testing utility for PostgreSQL and its extensions',
3435
url='https://github.com/postgrespro/testgres',
3536
long_description=readme,

‎testgres/__init__.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@
5151
from .operations.os_opsimportOsOperations,ConnectionParams
5252
from .operations.local_opsimportLocalOperations
5353
from .operations.remote_opsimportRemoteOperations
54-
from .plugins.probackup.gdbimportGDBobj
55-
from .plugins.probackup.appimportProbackupApp
56-
from .plugins.probackup.appimportProbackupException
57-
from .plugins.probackup.init_helpersimportinit_params
58-
from .plugins.probackup.storage.fs_backupimportFSTestBackupDir
5954

6055
__all__= [
6156
"get_new_node",
@@ -68,6 +63,5 @@
6863
"PostgresNode","NodeApp",
6964
"reserve_port","release_port","bound_ports","get_bin_path","get_pg_config","get_pg_version",
7065
"First","Any",
71-
"OsOperations","LocalOperations","RemoteOperations","ConnectionParams",
72-
"init_params","FSTestBackupDir","ProbackupException","ProbackupApp","GDBobj"
66+
"OsOperations","LocalOperations","RemoteOperations","ConnectionParams"
7367
]

‎testgres/plugins/probackup/storage/__init__.py

Whitespace-only changes.

‎tests/test_simple_remote.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
fromtestgres.utilsimportPgVer
5353
fromtestgres.nodeimportProcessProxy,ConnectionParams
5454

55-
conn_params=ConnectionParams(host=os.getenv('RDBMS_TESTPOOL1_HOST')or'172.18.0.3',
56-
username='dev',
55+
conn_params=ConnectionParams(host=os.getenv('RDBMS_TESTPOOL1_HOST')or'172.18.0.2',
56+
username=os.getenv('RDBMS_TESTPOOL_USERNAME')or'dev',
5757
ssh_key=os.getenv(
58-
'RDBMS_TESTPOOL_SSHKEY')or'../../container_files/postgres/ssh/id_ed25519')
58+
'RDBMS_TESTPOOL_SSHKEY')or'../../container_files/postgres/ssh/id_ed25519.pub')
5959
os_ops=RemoteOperations(conn_params)
6060
testgres_config.set_os_ops(os_ops=os_ops)
6161

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp