Skip to content

Commit 1820452

Browse files
test: do not assume error file
Error extension "file" field may change even between minor releases (and CI already fails [1]). It is safer not to assume anything. 1. https://github.com/tarantool/tarantool/actions/runs/3361368409/jobs/5571811177 Follows up #198
1 parent bdd4a45 commit 1820452

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/suites/test_dml.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def test_14_extra_error_info(self):
333333
self.con.eval("not a Lua code")
334334
except DatabaseError as exc:
335335
self.assertEqual(exc.extra_info.type, 'LuajitError')
336-
self.assertRegex(exc.extra_info.file, r'/tarantool')
336+
self.assertTrue(isinstance(exc.extra_info.file, str))
337337
self.assertTrue(exc.extra_info.line > 0)
338338
self.assertEqual(exc.extra_info.message, "eval:1: unexpected symbol near 'not'")
339339
self.assertEqual(exc.extra_info.errno, 0)
@@ -354,7 +354,7 @@ def test_15_extra_error_info_stacked(self):
354354
""")
355355
except DatabaseError as exc:
356356
self.assertEqual(exc.extra_info.type, 'ClientError')
357-
self.assertRegex(exc.extra_info.file, 'eval')
357+
self.assertTrue(isinstance(exc.extra_info.file, str))
358358
self.assertEqual(exc.extra_info.line, 3)
359359
self.assertEqual(exc.extra_info.message, "Timeout exceeded")
360360
self.assertEqual(exc.extra_info.errno, 0)
@@ -363,7 +363,7 @@ def test_15_extra_error_info_stacked(self):
363363
self.assertNotEqual(exc.extra_info.prev, None)
364364
prev = exc.extra_info.prev
365365
self.assertEqual(prev.type, 'ClientError')
366-
self.assertEqual(prev.file, 'eval')
366+
self.assertTrue(isinstance(exc.extra_info.file, str))
367367
self.assertEqual(prev.line, 2)
368368
self.assertEqual(prev.message, "Unknown error")
369369
self.assertEqual(prev.errno, 0)
@@ -380,7 +380,7 @@ def test_16_extra_error_info_fields(self):
380380
""")
381381
except DatabaseError as exc:
382382
self.assertEqual(exc.extra_info.type, 'AccessDeniedError')
383-
self.assertRegex(exc.extra_info.file, r'/tarantool')
383+
self.assertTrue(isinstance(exc.extra_info.file, str))
384384
self.assertTrue(exc.extra_info.line > 0)
385385
self.assertEqual(
386386
exc.extra_info.message,

0 commit comments

Comments
 (0)