diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-12-17 00:31:40 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-12-17 00:31:40 (GMT) |
| commit | 631546cf929098acf254d9eee4d3da39c6ed3444 (patch) | |
| tree | b96a2176f77a13e5b6ec7e3ea89db6de91f1dddd /Lib/asyncio/test_utils.py | |
| parent | a7f9933efacc017f9772ae12830e75ce88c3b7ec (diff) | |
| parent | d5c2a6210026834eb3cb7165e470d2cbc3065db8 (diff) | |
| download | cpython-631546cf929098acf254d9eee4d3da39c6ed3444.zip cpython-631546cf929098acf254d9eee4d3da39c6ed3444.tar.gz cpython-631546cf929098acf254d9eee4d3da39c6ed3444.tar.bz2 | |
Merge 3.4
Diffstat (limited to 'Lib/asyncio/test_utils.py')
| -rw-r--r-- | Lib/asyncio/test_utils.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py index 8170533..396e6ae 100644 --- a/Lib/asyncio/test_utils.py +++ b/Lib/asyncio/test_utils.py @@ -446,9 +446,14 @@ def disable_logger(): finally: logger.setLevel(old_level) -def mock_nonblocking_socket(): + +def mock_nonblocking_socket(proto=socket.IPPROTO_TCP, type=socket.SOCK_STREAM, + family=socket.AF_INET): """Create a mock of a non-blocking socket.""" - sock = mock.Mock(socket.socket) + sock = mock.MagicMock(socket.socket) + sock.proto = proto + sock.type = type + sock.family = family sock.gettimeout.return_value = 0.0 return sock |