NotificationsYou must be signed in to change notification settings
Fork37
Star150

Commite6f4448

committed

Total refactoring of tests

- TestgresRemoteTests does not use global variables and code- Explicit work with ..testgres folder

1 parenta14b3d7 commite6f4448Copy full SHA for e6f4448

File tree

5 files changed

+116

-99

lines changed

5 files changed

+116

-99

lines changed

`‎run_tests.sh‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ export VIRTUAL_ENV_DISABLE_PROMPT=1`
`22`	`22`	`source$VENV_PATH/bin/activate`
`23`	`23`
`24`	`24`	`# install utilities`
`25`		`-$PIP install coverage flake8 psutil Sphinx pytest pytest-xdist`
	`25`	`+$PIP install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil`
`26`	`26`
`27`	`27`	`# install testgres' dependencies`
`28`	`28`	`export PYTHONPATH=$(pwd)`
`29`		`-$PIP install.`
	`29`	`+#$PIP install .`
`30`	`30`
`31`	`31`	`# test code quality`
`32`	`32`	`flake8.`

`‎tests/test_local.py‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`	`importre`
`5`	`5`	`importtempfile`
`6`	`6`
`7`		`-fromtestgresimportExecUtilException`
`8`		`-fromtestgresimportInvalidOperationException`
`9`		`-fromtestgresimportLocalOperations`
	`7`	`+from..testgresimportExecUtilException`
	`8`	`+from..testgresimportInvalidOperationException`
	`9`	`+from..testgresimportLocalOperations`
`10`	`10`
`11`	`11`	`from .helpers.run_conditionsimportRunConditions`
`12`	`12`

`‎tests/test_remote.py‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`	`importre`
`5`	`5`	`importtempfile`
`6`	`6`
`7`		`-fromtestgresimportExecUtilException`
`8`		`-fromtestgresimportInvalidOperationException`
`9`		`-fromtestgresimportRemoteOperations`
`10`		`-fromtestgresimportConnectionParams`
	`7`	`+from..testgresimportExecUtilException`
	`8`	`+from..testgresimportInvalidOperationException`
	`9`	`+from..testgresimportRemoteOperations`
	`10`	`+from..testgresimportConnectionParams`
`11`	`11`
`12`	`12`
`13`	`13`	`classTestRemoteOperations:`

`‎tests/test_simple.py‎`

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`importre`
`3`	`3`	`importsubprocess`
`4`	`4`	`importtempfile`
`5`		`-importtestgres`
`6`	`5`	`importtime`
`7`	`6`	`importsix`
`8`	`7`	`importpytest`
`@@ -14,7 +13,9 @@`
`14`	`13`	`fromcontextlibimportcontextmanager`
`15`	`14`	`fromshutilimportrmtree`
`16`	`15`
`17`		`-fromtestgresimport \`
	`16`	`+from ..importtestgres`
	`17`	`+`
	`18`	`+from ..testgresimport \`
`18`	`19`	`InitNodeException, \`
`19`	`20`	`StartNodeException, \`
`20`	`21`	`ExecUtilException, \`
`@@ -25,31 +26,32 @@`
`25`	`26`	`InvalidOperationException, \`
`26`	`27`	`NodeApp`
`27`	`28`
`28`		`-fromtestgresimport \`
	`29`	`+from..testgresimport \`
`29`	`30`	`TestgresConfig, \`
`30`	`31`	`configure_testgres, \`
`31`	`32`	`scoped_config, \`
`32`	`33`	`pop_config`
`33`	`34`
`34`		`-fromtestgresimport \`
	`35`	`+from..testgresimport \`
`35`	`36`	`NodeStatus, \`
`36`	`37`	`ProcessType, \`
`37`	`38`	`IsolationLevel, \`
`38`	`39`	`get_new_node`
`39`	`40`
`40`		`-fromtestgresimport \`
	`41`	`+from..testgresimport \`
`41`	`42`	`get_bin_path, \`
`42`	`43`	`get_pg_config, \`
`43`	`44`	`get_pg_version`
`44`	`45`
`45`		`-fromtestgresimport \`
	`46`	`+from..testgresimport \`
`46`	`47`	`First, \`
`47`	`48`	`Any`
`48`	`49`
`49`	`50`	`# NOTE: those are ugly imports`
`50`		`-fromtestgresimportbound_ports`
`51`		`-fromtestgres.utilsimportPgVer,parse_pg_version`
`52`		`-fromtestgres.nodeimportProcessProxy`
	`51`	`+from ..testgresimportbound_ports`
	`52`	`+from ..testgres.utilsimportPgVer,parse_pg_version`
	`53`	`+from ..testgres.utilsimportfile_tail`
	`54`	`+from ..testgres.nodeimportProcessProxy`
`53`	`55`
`54`	`56`
`55`	`57`	`defpg_version_ge(version):`
`@@ -874,8 +876,6 @@ def test_auto_name(self):`
`874`	`876`	`assert ('testgres'inr.name)`
`875`	`877`
`876`	`878`	`deftest_file_tail(self):`
`877`		`-fromtestgres.utilsimportfile_tail`
`878`		`-`
`879`	`879`	`s1="the quick brown fox jumped over that lazy dog\n"`
`880`	`880`	`s2="abc\n"`
`881`	`881`	`s3="def\n"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite6f4448

File tree

5 files changed

5 files changed

`‎run_tests.sh‎`

`‎tests/test_local.py‎`

`‎tests/test_remote.py‎`

`‎tests/test_simple.py‎`

0 commit comments