Commit 25f0ea26 authored by Jason Madden's avatar Jason Madden

Python3.2 raises a different error message. Fixes checkExceptionLogsAtError

parent 3d31c7ab
...@@ -556,17 +556,23 @@ class ZRPCConnectionTests(ZEO.tests.ConnectionTests.CommonSetupTearDown): ...@@ -556,17 +556,23 @@ class ZRPCConnectionTests(ZEO.tests.ConnectionTests.CommonSetupTearDown):
'history() raised exception: history() takes at most ' 'history() raised exception: history() takes at most '
'3 arguments (5 given)' '3 arguments (5 given)'
) )
py32_msg = (
'history() raised exception: history() takes at most '
'3 positional arguments (5 given)'
)
py3_msg = ( py3_msg = (
'history() raised exception: history() takes ' 'history() raised exception: history() takes '
'from 2 to 3 positional arguments but 5 were given' 'from 2 to 3 positional arguments but 5 were given'
) )
for level, message, kw in log: for level, message, kw in log:
if message.endswith(py2_msg) or message.endswith(py3_msg): if (message.endswith(py2_msg) or
message.endswith(py32_msg) or
message.endswith(py3_msg)):
self.assertEqual(level,logging.ERROR) self.assertEqual(level,logging.ERROR)
self.assertEqual(kw,{'exc_info':True}) self.assertEqual(kw,{'exc_info':True})
break break
else: else:
self.fail("error not in log") self.fail("error not in log %s" % log)
# cleanup # cleanup
del conn.logger.log del conn.logger.log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment