mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

(Merge 3.4) asyncio: Fix unit tests on Windows, escape filenames in regex

Browse source
This commit is contained in:
Victor Stinner 2014-06-28 00:14:28 +02:00
commit 875dbedd28
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_asyncio/test_futures.py
View file

@ -322,9 +322,9 @@ class FutureTests(test_utils.TestCase):
r'source_traceback: Object created at \(most recent call last\):\n' r'source_traceback: Object created at \(most recent call last\):\n'
r' File' r' File'
r'.*\n' r'.*\n'
r' File "%s", line %s, in test_future_exception_never_retrieved\n' r' File "{filename}", line {lineno}, in test_future_exception_never_retrieved\n'
r' future = asyncio\.Future\(loop=self\.loop\)$' r' future = asyncio\.Future\(loop=self\.loop\)$'
% (frame[0], frame[1])) ).format(filename=re.escape(frame[0]), lineno=frame[1])
exc_info = (type(exc), exc, exc.__traceback__) exc_info = (type(exc), exc, exc.__traceback__)
m_log.error.assert_called_once_with(mock.ANY, exc_info=exc_info) m_log.error.assert_called_once_with(mock.ANY, exc_info=exc_info)
else: else:
@ -333,12 +333,12 @@ class FutureTests(test_utils.TestCase):
r'Future/Task created at \(most recent call last\):\n' r'Future/Task created at \(most recent call last\):\n'
r' File' r' File'
r'.*\n' r'.*\n'
r' File "%s", line %s, in test_future_exception_never_retrieved\n' r' File "{filename}", line {lineno}, in test_future_exception_never_retrieved\n'
r' future = asyncio\.Future\(loop=self\.loop\)\n' r' future = asyncio\.Future\(loop=self\.loop\)\n'
r'Traceback \(most recent call last\):\n' r'Traceback \(most recent call last\):\n'
r'.*\n' r'.*\n'
r'MemoryError$' r'MemoryError$'
% (frame[0], frame[1])) ).format(filename=re.escape(frame[0]), lineno=frame[1])
m_log.error.assert_called_once_with(mock.ANY, exc_info=False) m_log.error.assert_called_once_with(mock.ANY, exc_info=False)
message = m_log.error.call_args[0][0] message = m_log.error.call_args[0][0]
self.assertRegex(message, re.compile(regex, re.DOTALL)) self.assertRegex(message, re.compile(regex, re.DOTALL))

4
Lib/test/test_asyncio/test_tasks.py
View file

@ -1602,8 +1602,8 @@ class TaskTests(test_utils.TestCase):
r' File "%s", line %s, in test_coroutine_never_yielded\n' r' File "%s", line %s, in test_coroutine_never_yielded\n'
r' coro = coro_noop\(\)$' r' coro = coro_noop\(\)$'
% (re.escape(coro_noop.__qualname__), % (re.escape(coro_noop.__qualname__),
func_filename, func_lineno, re.escape(func_filename), func_lineno,
tb_filename, tb_lineno)) re.escape(tb_filename), tb_lineno))
self.assertRegex(message, re.compile(regex, re.DOTALL)) self.assertRegex(message, re.compile(regex, re.DOTALL))