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

Commit1a662f1

Browse files
[FIX] Tests include testgres by right way through import (#241)
When we do not have root __init__.py tests must to import testgres through"import testgres"not through"from <relative_path> import testgres"
1 parent6e5e4f5 commit1a662f1

File tree

9 files changed

+59
-59
lines changed

9 files changed

+59
-59
lines changed

‎testgres/plugins/pg_probackup2/pg_probackup2/tests/test_basic.py

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

7-
from ......importtestgres
7+
importtestgres
88
from ...pg_probackup2.appimportProbackupApp
99
from ...pg_probackup2.init_helpersimportInit,init_params
1010
from ..storage.fs_backupimportFSTestBackupDir

‎tests/helpers/global_data.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from...testgres.operations.os_opsimportOsOperations
2-
from...testgres.operations.os_opsimportConnectionParams
3-
from...testgres.operations.local_opsimportLocalOperations
4-
from...testgres.operations.remote_opsimportRemoteOperations
5-
6-
from...testgres.nodeimportPortManager
7-
from...testgres.nodeimportPortManager__ThisHost
8-
from...testgres.nodeimportPortManager__Generic
1+
fromtestgres.operations.os_opsimportOsOperations
2+
fromtestgres.operations.os_opsimportConnectionParams
3+
fromtestgres.operations.local_opsimportLocalOperations
4+
fromtestgres.operations.remote_opsimportRemoteOperations
5+
6+
fromtestgres.nodeimportPortManager
7+
fromtestgres.nodeimportPortManager__ThisHost
8+
fromtestgres.nodeimportPortManager__Generic
99

1010
importos
1111

‎tests/test_config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from..testgresimportTestgresConfig
2-
from..testgresimportconfigure_testgres
3-
from..testgresimportscoped_config
4-
from..testgresimportpop_config
1+
fromtestgresimportTestgresConfig
2+
fromtestgresimportconfigure_testgres
3+
fromtestgresimportscoped_config
4+
fromtestgresimportpop_config
55

6-
from ..importtestgres
6+
importtestgres
77

88
importpytest
99

‎tests/test_os_ops_common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
importthreading
1515
importtyping
1616

17-
from..testgresimportInvalidOperationException
18-
from..testgresimportExecUtilException
17+
fromtestgresimportInvalidOperationException
18+
fromtestgresimportExecUtilException
1919

2020

2121
classTestOsOpsCommon:

‎tests/test_os_ops_remote.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from .helpers.global_dataimportOsOpsDescrs
44
from .helpers.global_dataimportOsOperations
55

6-
from..testgresimportExecUtilException
6+
fromtestgresimportExecUtilException
77

88
importos
99
importpytest

‎tests/test_testgres_common.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
from .helpers.global_dataimportOsOperations
44
from .helpers.global_dataimportPortManager
55

6-
from..testgres.nodeimportPgVer
7-
from..testgres.nodeimportPostgresNode
8-
from..testgres.utilsimportget_pg_version2
9-
from..testgres.utilsimportfile_tail
10-
from..testgres.utilsimportget_bin_path2
11-
from..testgresimportProcessType
12-
from..testgresimportNodeStatus
13-
from..testgresimportIsolationLevel
6+
fromtestgres.nodeimportPgVer
7+
fromtestgres.nodeimportPostgresNode
8+
fromtestgres.utilsimportget_pg_version2
9+
fromtestgres.utilsimportfile_tail
10+
fromtestgres.utilsimportget_bin_path2
11+
fromtestgresimportProcessType
12+
fromtestgresimportNodeStatus
13+
fromtestgresimportIsolationLevel
1414

1515
# New name prevents to collect test-functions in TestgresException and fixes
1616
# the problem with pytest warning.
17-
from..testgresimportTestgresExceptionastestgres_TestgresException
18-
19-
from..testgresimportInitNodeException
20-
from..testgresimportStartNodeException
21-
from..testgresimportQueryException
22-
from..testgresimportExecUtilException
23-
from..testgresimportTimeoutException
24-
from..testgresimportInvalidOperationException
25-
from..testgresimportBackupException
26-
from..testgresimportProgrammingError
27-
from..testgresimportscoped_config
28-
from..testgresimportFirst,Any
17+
fromtestgresimportTestgresExceptionastestgres_TestgresException
18+
19+
fromtestgresimportInitNodeException
20+
fromtestgresimportStartNodeException
21+
fromtestgresimportQueryException
22+
fromtestgresimportExecUtilException
23+
fromtestgresimportTimeoutException
24+
fromtestgresimportInvalidOperationException
25+
fromtestgresimportBackupException
26+
fromtestgresimportProgrammingError
27+
fromtestgresimportscoped_config
28+
fromtestgresimportFirst,Any
2929

3030
fromcontextlibimportcontextmanager
3131

‎tests/test_testgres_local.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
importplatform
88
importlogging
99

10-
from ..importtestgres
10+
importtestgres
1111

12-
from..testgresimportStartNodeException
13-
from..testgresimportExecUtilException
14-
from..testgresimportNodeApp
15-
from..testgresimportscoped_config
16-
from..testgresimportget_new_node
17-
from..testgresimportget_bin_path
18-
from..testgresimportget_pg_config
19-
from..testgresimportget_pg_version
12+
fromtestgresimportStartNodeException
13+
fromtestgresimportExecUtilException
14+
fromtestgresimportNodeApp
15+
fromtestgresimportscoped_config
16+
fromtestgresimportget_new_node
17+
fromtestgresimportget_bin_path
18+
fromtestgresimportget_pg_config
19+
fromtestgresimportget_pg_version
2020

2121
# NOTE: those are ugly imports
22-
from..testgres.utilsimportbound_ports
23-
from..testgres.utilsimportPgVer
24-
from..testgres.nodeimportProcessProxy
22+
fromtestgres.utilsimportbound_ports
23+
fromtestgres.utilsimportPgVer
24+
fromtestgres.nodeimportProcessProxy
2525

2626

2727
defpg_version_ge(version):

‎tests/test_testgres_remote.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
from .helpers.global_dataimportPostgresNodeService
88
from .helpers.global_dataimportPostgresNodeServices
99

10-
from ..importtestgres
10+
importtestgres
1111

12-
from..testgres.exceptionsimportInitNodeException
13-
from..testgres.exceptionsimportExecUtilException
12+
fromtestgres.exceptionsimportInitNodeException
13+
fromtestgres.exceptionsimportExecUtilException
1414

15-
from..testgres.configimportscoped_config
16-
from..testgres.configimporttestgres_config
15+
fromtestgres.configimportscoped_config
16+
fromtestgres.configimporttestgres_config
1717

18-
from..testgresimportget_bin_path
19-
from..testgresimportget_pg_config
18+
fromtestgresimportget_bin_path
19+
fromtestgresimportget_pg_config
2020

2121
# NOTE: those are ugly imports
2222

‎tests/test_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
from .helpers.global_dataimportOsOpsDescrs
33
from .helpers.global_dataimportOsOperations
44

5-
from..testgres.utilsimportparse_pg_version
6-
from..testgres.utilsimportget_pg_config2
7-
from..testgresimportscoped_config
5+
fromtestgres.utilsimportparse_pg_version
6+
fromtestgres.utilsimportget_pg_config2
7+
fromtestgresimportscoped_config
88

99
importpytest
1010
importtyping

0 commit comments

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