Commit2bb38dc

committed

[BUG FIX] PostgresNode::safe_psql did not respect "expect_error" parameter

1 parentf9ddd04 commit2bb38dcCopy full SHA for 2bb38dc

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1059,13 +1059,22 @@ def safe_psql(self, query=None, expect_error=False, **kwargs):`
`1059`	`1059`	`"""`
`1060`	`1060`	`asserttype(kwargs)==dict# noqa: E721`
`1061`	`1061`	`assertnot ("ignore_errors"inkwargs.keys())`
	`1062`	`+assertnot ("expect_error"inkwargs.keys())`
`1062`	`1063`
`1063`	`1064`	`# force this setting`
`1064`	`1065`	`kwargs['ON_ERROR_STOP']=1`
`1065`	`1066`	`try:`
`1066`	`1067`	`ret,out,err=self._psql(ignore_errors=False,query=query,**kwargs)`
`1067`	`1068`	`exceptExecUtilExceptionase:`
`1068`		`-raiseQueryException(e.message,query)`
	`1069`	`+ifnotexpect_error:`
	`1070`	`+raiseQueryException(e.message,query)`
	`1071`	`+`
	`1072`	`+iftype(e.error)==bytes:# noqa: E721`
	`1073`	`+returne.error.decode("utf-8")# throw`
	`1074`	`+`
	`1075`	`+# [2024-12-09] This situation is not expected`
	`1076`	`+assertFalse`
	`1077`	`+returne.error`
`1069`	`1078`
`1070`	`1079`	`ifexpect_error:`
`1071`	`1080`	assertFalse,"Exception was expected, but query finished successfully: `{}` ".format(query)

Comments

(0)