Skip to content

Commit 058efcc

Browse files
committed
test: use coverage instead of equality to test error payload p.2
We are going to add 'name' payload field for every client error. So we need to tweak more test to handle this. Need for tarantool/tarantool#9875
1 parent 3d397aa commit 058efcc

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

test/suites/test_dml.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,15 @@ def test_15_extra_error_info_stacked(self):
385385
error(e2)
386386
""")
387387
except DatabaseError as exc:
388+
expected_fields = {}
388389
self.assertEqual(exc.extra_info.type, 'ClientError')
389390
self.assertTrue(isinstance(exc.extra_info.file, str))
390391
self.assertEqual(exc.extra_info.line, 3)
391392
self.assertEqual(exc.extra_info.message, "Timeout exceeded")
392393
self.assertEqual(exc.extra_info.errno, 0)
393394
self.assertEqual(exc.extra_info.errcode, 78)
394-
self.assertEqual(exc.extra_info.fields, None)
395+
self.assertGreaterEqual(exc.extra_info.fields.items(),
396+
expected_fields.items())
395397
self.assertNotEqual(exc.extra_info.prev, None)
396398
prev = exc.extra_info.prev
397399
self.assertEqual(prev.type, 'ClientError')
@@ -400,7 +402,8 @@ def test_15_extra_error_info_stacked(self):
400402
self.assertEqual(prev.message, "Unknown error")
401403
self.assertEqual(prev.errno, 0)
402404
self.assertEqual(prev.errcode, 0)
403-
self.assertEqual(prev.fields, None)
405+
self.assertGreaterEqual(prev.fields.items(),
406+
expected_fields.items())
404407
else:
405408
self.fail('Expected error')
406409

test/suites/test_error_ext.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,11 @@ def test_tarantool_decode(self):
327327
self.assertEqual(err.message, expected_err.message)
328328
self.assertEqual(err.errno, expected_err.errno)
329329
self.assertEqual(err.errcode, expected_err.errcode)
330-
if expected_err.fields is not None:
331-
self.assertGreaterEqual(err.fields.items(),
332-
expected_err.fields.items())
333-
else:
334-
self.assertEqual(err.fields, None)
330+
expected_fields = expected_err.fields
331+
if expected_fields is None:
332+
expected_fields = {}
333+
self.assertGreaterEqual(err.fields.items(),
334+
expected_fields.items())
335335

336336
err = err.prev
337337
expected_err = expected_err.prev

0 commit comments

Comments
 (0)