Skip to content

Commit acc1446

Browse files
nshyDifferentialOrange
authored andcommitted
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 acc1446

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

test/suites/test_dml.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,12 @@ def test_15_extra_error_info_stacked(self):
391391
self.assertEqual(exc.extra_info.message, "Timeout exceeded")
392392
self.assertEqual(exc.extra_info.errno, 0)
393393
self.assertEqual(exc.extra_info.errcode, 78)
394-
self.assertEqual(exc.extra_info.fields, None)
394+
actual_fields = exc.extra_info.fields
395+
if actual_fields is None:
396+
actual_fields = {}
397+
expected_fields = {}
398+
self.assertGreaterEqual(actual_fields.items(),
399+
expected_fields.items())
395400
self.assertNotEqual(exc.extra_info.prev, None)
396401
prev = exc.extra_info.prev
397402
self.assertEqual(prev.type, 'ClientError')
@@ -400,7 +405,12 @@ def test_15_extra_error_info_stacked(self):
400405
self.assertEqual(prev.message, "Unknown error")
401406
self.assertEqual(prev.errno, 0)
402407
self.assertEqual(prev.errcode, 0)
403-
self.assertEqual(prev.fields, None)
408+
actual_fields = prev.fields
409+
if actual_fields is None:
410+
actual_fields = {}
411+
expected_fields = {}
412+
self.assertGreaterEqual(actual_fields.items(),
413+
expected_fields.items())
404414
else:
405415
self.fail('Expected error')
406416

test/suites/test_error_ext.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,14 @@ 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+
actual_fields = err.fields
334+
if actual_fields is None:
335+
actual_fields = {}
336+
self.assertGreaterEqual(actual_fields.items(),
337+
expected_fields.items())
335338

336339
err = err.prev
337340
expected_err = expected_err.prev

0 commit comments

Comments
 (0)