summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-05-20 13:57:32 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-05-20 13:57:32 (GMT)
commit1c4398f880c21d5e14462ef7096319da39148774 (patch)
tree12b59d2c7b22f7e7b25aba29abd7ce0d1decb976
parent92ab9a183c25a223b8cd9264a28792abaa85483a (diff)
parent93668f4459fea03b88abda0c86f1981f402b15fb (diff)
downloadcpython-1c4398f880c21d5e14462ef7096319da39148774.zip
cpython-1c4398f880c21d5e14462ef7096319da39148774.tar.gz
cpython-1c4398f880c21d5e14462ef7096319da39148774.tar.bz2
(Merge 3.4) asyncio: test_base_events: use mock.Mock instead of
unittest.mock.Mock to simplify the synchronization with Trollius
-rw-r--r--Lib/test/test_asyncio/test_base_events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index 544bd3d..4ba9556 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -141,7 +141,7 @@ class BaseEventLoopTests(unittest.TestCase):
pass
other_loop = base_events.BaseEventLoop()
- other_loop._selector = unittest.mock.Mock()
+ other_loop._selector = mock.Mock()
asyncio.set_event_loop(other_loop)
# raise RuntimeError if the event loop is different in debug mode