NotificationsYou must be signed in to change notification settings
Fork35
Star144

Commitf848a63

committed

PostgresNode::safe_psql raises InvalidOperationException

If expect_error is True and no error is detected, safe_psql raises InvalidOperationException exception.Tests (local, remote) are added.

1 parent45b8dc0 commitf848a63Copy full SHA for f848a63

File tree

5 files changed

+47

-5

lines changed

testgres
tests
- test_simple.py
- test_simple_remote.py

5 files changed

+47

-5

lines changed

`‎testgres/init.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`CatchUpException, \`
`24`	`24`	`StartNodeException, \`
`25`	`25`	`InitNodeException, \`
`26`		`-BackupException`
	`26`	`+BackupException, \`
	`27`	`+InvalidOperationException`
`27`	`28`
`28`	`29`	`from .enumsimport \`
`29`	`30`	`XLogMethod, \`

`‎testgres/exceptions.py`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,3 +103,6 @@ class InitNodeException(TestgresException):`
`103`	`103`
`104`	`104`	`classBackupException(TestgresException):`
`105`	`105`	`pass`
	`106`	`+`
	`107`	`+classInvalidOperationException(TestgresException):`
	`108`	`+pass`

`‎testgres/node.py`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@`
`73`	`73`	`TimeoutException, \`
`74`	`74`	`InitNodeException, \`
`75`	`75`	`TestgresException, \`
`76`		`-BackupException`
	`76`	`+BackupException, \`
	`77`	`+InvalidOperationException`
`77`	`78`
`78`	`79`	`from .loggerimportTestgresLogger`
`79`	`80`
`@@ -1089,7 +1090,7 @@ def safe_psql(self, query=None, expect_error=False, **kwargs):`
`1089`	`1090`	`returne.error`
`1090`	`1091`
`1091`	`1092`	`ifexpect_error:`
`1092`		-assertFalse,"Exception was expected, but query finished successfully: `{}`".format(query)
	`1093`	+raiseInvalidOperationException("Exception was expected, but query finished successfully: `{}`.".format(query))
`1093`	`1094`
`1094`	`1095`	`returnout`
`1095`	`1096`

`‎tests/test_simple.py`

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,9 @@`
`23`	`23`	`BackupException, \`
`24`	`24`	`QueryException, \`
`25`	`25`	`TimeoutException, \`
`26`		`-TestgresException,NodeApp`
	`26`	`+TestgresException, \`
	`27`	`+InvalidOperationException, \`
	`28`	`+NodeApp`
`27`	`29`
`28`	`30`	`fromtestgresimport \`
`29`	`31`	`TestgresConfig, \`
`@@ -310,6 +312,23 @@ def test_psql(self):`
`310`	`312`	`withself.assertRaises(QueryException):`
`311`	`313`	`node.safe_psql('select 1')`
`312`	`314`
	`315`	`+deftest_safe_psql__expect_error(self):`
	`316`	`+withget_new_node().init().start()asnode:`
	`317`	`+err=node.safe_psql('select_or_not_select 1',expect_error=True)`
	`318`	`+self.assertTrue(type(err)==str)# noqa: E721`
	`319`	`+self.assertIn('select_or_not_select',err)`
	`320`	`+self.assertIn('ERROR: syntax error at or near "select_or_not_select"',err)`
	`321`	`+`
	`322`	`+# ---------`
	`323`	`+withself.assertRaises(InvalidOperationException)asctx:`
	`324`	`+node.safe_psql("select 1;",expect_error=True)`
	`325`	`+`
	`326`	+self.assertEqual(str(ctx.exception),"Exception was expected, but query finished successfully: `select 1;`.")
	`327`	`+`
	`328`	`+# ---------`
	`329`	`+res=node.safe_psql("select 1;",expect_error=False)`
	`330`	`+self.assertEqual(res,b'1\n')`
	`331`	`+`
`313`	`332`	`deftest_transactions(self):`
`314`	`333`	`withget_new_node().init().start()asnode:`
`315`	`334`

`‎tests/test_simple_remote.py`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`BackupException, \`
`24`	`24`	`QueryException, \`
`25`	`25`	`TimeoutException, \`
`26`		`-TestgresException`
	`26`	`+TestgresException, \`
	`27`	`+InvalidOperationException`
`27`	`28`
`28`	`29`	`fromtestgres.configimport \`
`29`	`30`	`TestgresConfig, \`
`@@ -295,6 +296,23 @@ def test_psql(self):`
`295`	`296`	`withself.assertRaises(QueryException):`
`296`	`297`	`node.safe_psql('select 1')`
`297`	`298`
	`299`	`+deftest_safe_psql__expect_error(self):`
	`300`	`+withget_remote_node(conn_params=conn_params).init().start()asnode:`
	`301`	`+err=node.safe_psql('select_or_not_select 1',expect_error=True)`
	`302`	`+self.assertTrue(type(err)==str)# noqa: E721`
	`303`	`+self.assertIn('select_or_not_select',err)`
	`304`	`+self.assertIn('ERROR: syntax error at or near "select_or_not_select"',err)`
	`305`	`+`
	`306`	`+# ---------`
	`307`	`+withself.assertRaises(InvalidOperationException)asctx:`
	`308`	`+node.safe_psql("select 1;",expect_error=True)`
	`309`	`+`
	`310`	+self.assertEqual(str(ctx.exception),"Exception was expected, but query finished successfully: `select 1;`.")
	`311`	`+`
	`312`	`+# ---------`
	`313`	`+res=node.safe_psql("select 1;",expect_error=False)`
	`314`	`+self.assertEqual(res,b'1\n')`
	`315`	`+`
`298`	`316`	`deftest_transactions(self):`
`299`	`317`	`withget_remote_node(conn_params=conn_params).init().start()asnode:`
`300`	`318`	`withnode.connect()ascon:`

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!

Commitf848a63

File tree

5 files changed

5 files changed

`‎testgres/init.py`

`‎testgres/exceptions.py`

`‎testgres/node.py`

`‎tests/test_simple.py`

`‎tests/test_simple_remote.py`

0 commit comments

Movatterモバイル変換

File tree

5 files changed

5 files changed

‎testgres/__init__.py

‎testgres/exceptions.py

‎testgres/node.py

‎tests/test_simple.py

‎tests/test_simple_remote.py

0 commit comments

`‎testgres/init.py`

`‎testgres/exceptions.py`

`‎testgres/node.py`

`‎tests/test_simple.py`

`‎tests/test_simple_remote.py`