Skip to content

test: use coverage instead of equality to test error payload p.2 #321

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 1 commit into from
Apr 11, 2024
Merged

test: use coverage instead of equality to test error payload p.2 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions test/suites/test_dml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,12 @@ def test_15_extra_error_info_stacked(self):
self.assertEqual(exc.extra_info.message, "Timeout exceeded")
self.assertEqual(exc.extra_info.errno, 0)
self.assertEqual(exc.extra_info.errcode, 78)
self.assertEqual(exc.extra_info.fields, None)
actual_fields = exc.extra_info.fields
if actual_fields is None:
actual_fields = {}
expected_fields = {}
self.assertGreaterEqual(actual_fields.items(),
expected_fields.items())
self.assertNotEqual(exc.extra_info.prev, None)
prev = exc.extra_info.prev
self.assertEqual(prev.type, 'ClientError')
Expand All @@ -400,7 +405,12 @@ def test_15_extra_error_info_stacked(self):
self.assertEqual(prev.message, "Unknown error")
self.assertEqual(prev.errno, 0)
self.assertEqual(prev.errcode, 0)
self.assertEqual(prev.fields, None)
actual_fields = prev.fields
if actual_fields is None:
actual_fields = {}
expected_fields = {}
self.assertGreaterEqual(actual_fields.items(),
expected_fields.items())
else:
self.fail('Expected error')

Expand Down
13 changes: 8 additions & 5 deletions test/suites/test_error_ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,14 @@ def test_tarantool_decode(self):
self.assertEqual(err.message, expected_err.message)
self.assertEqual(err.errno, expected_err.errno)
self.assertEqual(err.errcode, expected_err.errcode)
if expected_err.fields is not None:
self.assertGreaterEqual(err.fields.items(),
expected_err.fields.items())
else:
self.assertEqual(err.fields, None)
expected_fields = expected_err.fields
if expected_fields is None:
expected_fields = {}
actual_fields = err.fields
if actual_fields is None:
actual_fields = {}
self.assertGreaterEqual(actual_fields.items(),
expected_fields.items())

err = err.prev
expected_err = expected_err.prev
Expand Down
Loading