NotificationsYou must be signed in to change notification settings
Fork35
Star144

Commit3b3f628

committed

fix tests

1 parent27cf106 commit3b3f628Copy full SHA for 3b3f628

File tree

2 files changed

-17

lines changed

testgres
- testgres.py
tests
- test_simple.py

2 files changed

-17

lines changed

`‎testgres/testgres.py`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ def init(self, allow_streaming=False, fsync=False, initdb_params=[]):`
`484`	`484`
`485`	`485`	`ifallow_streaming:`
`486`	`486`	`cur_ver=LooseVersion(get_pg_config()["VERSION_NUM"])`
`487`		`-min_ver=LooseVersion('9.6.0')`
	`487`	`+min_ver=LooseVersion('9.6')`
`488`	`488`
`489`	`489`	`# select a proper wal_level for PostgreSQL`
`490`	`490`	`wal_level="hot_standby"ifcur_ver<min_verelse"replica"`
`@@ -907,7 +907,7 @@ def catchup(self):`
`907`	`907`	`master=self.master`
`908`	`908`
`909`	`909`	`cur_ver=LooseVersion(get_pg_config()["VERSION_NUM"])`
`910`		`-min_ver=LooseVersion('10.0')`
	`910`	`+min_ver=LooseVersion('10')`
`911`	`911`
`912`	`912`	`ifcur_ver>=min_ver:`
`913`	`913`	`poll_lsn="select pg_current_wal_lsn()::text"`
`@@ -1119,7 +1119,8 @@ def get_pg_config():`
`1119`	`1119`
`1120`	`1120`	`# Fetch version of PostgreSQL and save it as VERSION_NUM`
`1121`	`1121`	`version_parts=pg_config_data["VERSION"].split(" ")`
`1122`		`-pg_config_data["VERSION_NUM"]=version_parts[-1]`
	`1122`	`+version,_,_=version_parts[-1].partition('beta')`
	`1123`	`+pg_config_data["VERSION_NUM"]=version`
`1123`	`1124`
`1124`	`1125`	`returnpg_config_data`
`1125`	`1126`

`‎tests/test_simple.py`

Lines changed: 4 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,9 @@`
`7`	`7`	`importlogging.config`
`8`	`8`	`importsubprocess`
`9`	`9`
`10`		`-fromdistutils.versionimportLooseVersion`
`11`		`-`
`12`	`10`	`fromtestgresimportInitNodeException, \`
`13`	`11`	`StartNodeException,ExecUtilException, \`
`14`		`-BackupException,QueryException`
	`12`	`+BackupException,QueryException,CatchUpException`
`15`	`13`
`16`	`14`	`fromtestgresimportget_new_node,get_pg_config`
`17`	`15`	`fromtestgresimportbound_ports`
`@@ -28,8 +26,6 @@ def test_double_init(self):`
`28`	`26`	`node.init()`
`29`	`27`	`exceptInitNodeExceptionase:`
`30`	`28`	`got_exception=True`
`31`		`-exceptExceptionase:`
`32`		`-pass`
`33`	`29`
`34`	`30`	`self.assertTrue(got_exception)`
`35`	`31`
`@@ -41,8 +37,6 @@ def test_uninitialized_start(self):`
`41`	`37`	`node.start()`
`42`	`38`	`exceptStartNodeExceptionase:`
`43`	`39`	`got_exception=True`
`44`		`-exceptExceptionase:`
`45`		`-pass`
`46`	`40`
`47`	`41`	`self.assertTrue(got_exception)`
`48`	`42`
`@@ -145,21 +139,17 @@ def test_control_data(self):`
`145`	`139`	`node.get_control_data()`
`146`	`140`	`exceptExecUtilExceptionase:`
`147`	`141`	`got_exception=True`
`148`		`-exceptExceptionase:`
`149`		`-pass`
`150`	`142`	`self.assertTrue(got_exception)`
`151`	`143`
`152`	`144`	`got_exception=False`
`153`	`145`
`154`	`146`	`try:`
`155`	`147`	`node.init()`
`156`	`148`	`data=node.get_control_data()`
`157`		`-self.assertIsNotNode(data)`
	`149`	`+self.assertIsNotNone(data)`
`158`	`150`	`exceptExecUtilExceptionase:`
`159`	`151`	`print(e.message)`
`160`	`152`	`got_exception=True`
`161`		`-exceptExceptionase:`
`162`		`-pass`
`163`	`153`	`self.assertFalse(got_exception)`
`164`	`154`
`165`	`155`	`deftest_backup_simple(self):`
`@@ -257,8 +247,8 @@ def test_incorrect_catchup(self):`
`257`	`247`	`got_exception=False`
`258`	`248`	`try:`
`259`	`249`	`node.catchup()`
`260`		`-exceptExceptionase:`
`261`		`-pass`
	`250`	`+exceptCatchUpExceptionase:`
	`251`	`+got_exception=True`
`262`	`252`	`self.assertTrue(got_exception)`
`263`	`253`
`264`	`254`	`deftest_dump(self):`

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!

Commit3b3f628

File tree

2 files changed

2 files changed

`‎testgres/testgres.py`

`‎tests/test_simple.py`

0 commit comments