From e3f600433b83619e327863b5ce71855aed9d0b3d Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 16 Mar 2017 07:50:48 -0700
Subject: [PATCH] Fixed None timeout support #1720

---
 CHANGES.rst                     |  2 ++
 tests/test_client_functional.py | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index b312cdbbf6..71807e9b94 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,8 @@ CHANGES
 2.0.0 (2017-03-xx)
 ------------------
 
+- Fixed None timeout support #1720
+
 
 `2.0.0rc1` (2017-03-15)
 -----------------------
diff --git a/tests/test_client_functional.py b/tests/test_client_functional.py
index 02be8e3374..8fb772e836 100644
--- a/tests/test_client_functional.py
+++ b/tests/test_client_functional.py
@@ -659,6 +659,22 @@ def handler(request):
         yield from resp.read()
 
 
+@asyncio.coroutine
+def test_timeout_none(loop, test_client, mocker):
+    @asyncio.coroutine
+    def handler(request):
+        resp = web.StreamResponse()
+        yield from resp.prepare(request)
+        return resp
+
+    app = web.Application(loop=loop)
+    app.router.add_route('GET', '/', handler)
+    client = yield from test_client(app)
+
+    resp = yield from client.get('/', timeout=None)
+    assert resp.status == 200
+
+
 @asyncio.coroutine
 def test_readline_error_on_conn_close(loop, test_client):