Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Proposal to fix #154 (v2) #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Dec 10, 2024
Merged

Proposal to fix #154 (v2) #161

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f9ddd04
Proposal to fix #154 (v2)
dmitry-lipetsk Dec 8, 2024
2bb38dc
[BUG FIX] PostgresNode::safe_psql did not respect "expect_error" para…
dmitry-lipetsk Dec 9, 2024
45b8dc0
[BUG FIX] A problem in psql/safe_psql and 'input' data was fixed [loc…
dmitry-lipetsk Dec 9, 2024
f848a63
PostgresNode::safe_psql raises InvalidOperationException
dmitry-lipetsk Dec 9, 2024
db0744e
A problem with InvalidOperationException and flake8 is fixed
dmitry-lipetsk Dec 9, 2024
5bb1510
A code style is fixed [flake8]
dmitry-lipetsk Dec 9, 2024
31c7bce
[BUG FIX] Wrappers for psql use subprocess.PIPE for stdout and stderr
dmitry-lipetsk Dec 9, 2024
b013801
[BUG FIX] TestgresTests::test_safe_psql__expect_error uses rm_carriag…
dmitry-lipetsk Dec 9, 2024
c49ee4c
node.py is updated [formatting]
dmitry-lipetsk Dec 10, 2024
6a0e714
Formatting
dmitry-lipetsk Dec 10, 2024
3cc19d2
raise_error.py is moved into testgres/operations from testgres/helpers
dmitry-lipetsk Dec 10, 2024
7b70e9e
Helpers.GetDefaultEncoding is added
dmitry-lipetsk Dec 10, 2024
cd0b5f8
Code normalization
dmitry-lipetsk Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[BUG FIX] PostgresNode::safe_psql did not respect "expect_error" para… 
…meter
  • Loading branch information
@dmitry-lipetsk
dmitry-lipetsk committed Dec 9, 2024
commit 2bb38dc45b69c4d5d4c93a65fea4b64b81511287
11 changes: 10 additions & 1 deletion testgres/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,13 +1059,22 @@ def safe_psql(self, query=None, expect_error=False, **kwargs):
"""
assert type(kwargs) == dict # noqa: E721
assert not ("ignore_errors" in kwargs.keys())
assert not ("expect_error" in kwargs.keys())

# force this setting
kwargs['ON_ERROR_STOP'] = 1
try:
ret, out, err = self._psql(ignore_errors=False, query=query, **kwargs)
except ExecUtilException as e:
raise QueryException(e.message, query)
if not expect_error:
raise QueryException(e.message, query)

if type(e.error) == bytes: # noqa: E721
return e.error.decode("utf-8") # throw

# [2024-12-09] This situation is not expected
assert False
return e.error

if expect_error:
assert False, "Exception was expected, but query finished successfully: `{}` ".format(query)
Expand Down