From 04b2e981e282f316cd4c119c0533139c2684270f Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Fri, 17 Jul 2015 12:02:42 +0300
Subject: [PATCH 1/2] Get rid of using external resource in tests

---
 tests/test_simple.py | 61 +++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 40 deletions(-)

diff --git a/tests/test_simple.py b/tests/test_simple.py
index a8bf370e..a853859d 100644
--- a/tests/test_simple.py
+++ b/tests/test_simple.py
@@ -6,36 +6,25 @@
 
 
 @asyncio.coroutine
-def simple_http_client(url):
-    """Just a simple http client, for testing."""
-    u = urllib.parse.urlparse(url)
-    port = u.port if u.port else 80
-    r, w = yield from asyncio.open_connection(host=u.netloc, port=port)
-    w.write(b'GET ' + u.path.encode() + b' HTTP/1.0\r\n')
-    w.write(b'Host: ' + u.netloc.encode() + b'\r\n')
-    w.write(b'\r\n')
-    yield from w.drain()
-
-    resp = yield from r.read()
-
-    w.close()
-    return resp
+def async_coro(loop):
+    yield from asyncio.sleep(0, loop=loop)
+    return 'ok'
 
 
 def test_event_loop_fixture(event_loop):
     """Test the injection of the event_loop fixture."""
     assert event_loop
-    url = 'http://httpbin.org/get'
-    resp = event_loop.run_until_complete(simple_http_client(url))
-    assert b'HTTP/1.1 200 OK' in resp
+    ret = event_loop.run_until_complete(async_coro(event_loop))
+    assert ret == 'ok'
 
 
 def test_event_loop_processpool_fixture(event_loop_process_pool):
     """Test the injection of the event_loop with a process pool fixture."""
     assert event_loop_process_pool
-    url = 'http://httpbin.org/get'
-    resp = event_loop_process_pool.run_until_complete(simple_http_client(url))
-    assert b'HTTP/1.1 200 OK' in resp
+
+    ret = event_loop_process_pool.run_until_complete(
+        async_coro(event_loop_process_pool))
+    assert ret == 'ok'
 
     this_pid = os.getpid()
     future = event_loop_process_pool.run_in_executor(None, os.getpid)
@@ -46,33 +35,24 @@ def test_event_loop_processpool_fixture(event_loop_process_pool):
 @pytest.mark.asyncio
 def test_asyncio_marker():
     """Test the asyncio pytest marker."""
-    url = 'http://httpbin.org/get'
-    resp = yield from simple_http_client(url)
-    assert b'HTTP/1.1 200 OK' in resp
+    yield  # sleep(0)
 
 
 @pytest.mark.asyncio
 def test_asyncio_marker_with_default_param(a_param=None):
     """Test the asyncio pytest marker."""
-    url = 'http://httpbin.org/get'
-    resp = yield from simple_http_client(url)
-    assert b'HTTP/1.1 200 OK' in resp
+    yield  # sleep(0)
 
 
 @pytest.mark.asyncio_process_pool
 def test_asyncio_process_pool_marker(event_loop):
     """Test the asyncio pytest marker."""
-    url = 'http://httpbin.org/get'
-    resp = yield from simple_http_client(url)
-    assert b'HTTP/1.1 200 OK' in resp
-
-    this_pid = os.getpid()
-    pool_pid = yield from event_loop.run_in_executor(None, os.getpid)
-    assert this_pid != pool_pid
+    ret = yield from async_coro(event_loop)
+    assert ret == 'ok'
 
 
 @pytest.mark.asyncio
-def test_unused_port_fixture(unused_tcp_port):
+def test_unused_port_fixture(unused_tcp_port, event_loop):
     """Test the unused TCP port fixture."""
 
     @asyncio.coroutine
@@ -80,11 +60,13 @@ def closer(_, writer):
         writer.close()
 
     server1 = yield from asyncio.start_server(closer, host='localhost',
-                                              port=unused_tcp_port)
+                                              port=unused_tcp_port,
+                                              loop=event_loop)
 
     with pytest.raises(IOError):
         yield from asyncio.start_server(closer, host='localhost',
-                                        port=unused_tcp_port)
+                                        port=unused_tcp_port,
+                                        loop=event_loop)
 
     server1.close()
     yield from server1.wait_closed()
@@ -94,8 +76,7 @@ class Test:
     """Test that asyncio marked functions work in test methods."""
 
     @pytest.mark.asyncio
-    def test_asyncio_marker_method(self):
+    def test_asyncio_marker_method(self, event_loop):
         """Test the asyncio pytest marker in a Test class."""
-        url = 'http://httpbin.org/get'
-        resp = yield from simple_http_client(url)
-        assert b'HTTP/1.1 200 OK' in resp
+        ret = yield from async_coro(event_loop)
+        assert ret == 'ok'

From 7dbf83091647a9f4771830f6671e3e0599b1b5eb Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Fri, 17 Jul 2015 12:04:41 +0300
Subject: [PATCH 2/2] Drop unused imports

---
 tests/test_simple.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_simple.py b/tests/test_simple.py
index a853859d..7fc7a346 100644
--- a/tests/test_simple.py
+++ b/tests/test_simple.py
@@ -1,7 +1,6 @@
 """Quick'n'dirty unit tests for provided fixtures and markers."""
 import asyncio
 import os
-import urllib
 import pytest