fix multiple other locations that use the httpserver/httpsserver fixture (#260)

see #259 for context

closes #260

Signed-off-by: Benjamin Wohlwend <[email protected]>

Author: beniwohli

conftest.py

@@ -4,7 +4,7 @@
 
 from tests.fixtures import (elasticapm_client, instrument, not_so_random,
                             sending_elasticapm_client, validating_httpserver,
-                            waiting_httpserver)
+                            waiting_httpserver, waiting_httpsserver)
 from tests.utils.compat import middleware_setting
 
 try:

tests/asyncio/test_asyncio_http.py

@@ -89,22 +89,22 @@ async def test_send_timeout(mock_client):
 
 
 @pytest.mark.asyncio
-async def test_ssl_verify_fails(httpsserver):
+async def test_ssl_verify_fails(waiting_httpsserver):
     from elasticapm.transport.asyncio import AsyncioHTTPTransport
     from elasticapm.transport.base import TransportException
 
-    httpsserver.serve_content(code=202, content='', headers={'Location': 'http://example.com/foo'})
-    transport = AsyncioHTTPTransport(urlparse(httpsserver.url))
+    waiting_httpsserver.serve_content(code=202, content='', headers={'Location': 'http://example.com/foo'})
+    transport = AsyncioHTTPTransport(urlparse(waiting_httpsserver.url))
     with pytest.raises(TransportException) as exc_info:
         await transport.send(b'x', {})
     assert 'CERTIFICATE_VERIFY_FAILED' in str(exc_info)
 
 
 @pytest.mark.asyncio
-async def test_ssl_verify_disable(httpsserver):
+async def test_ssl_verify_disable(waiting_httpsserver):
     from elasticapm.transport.asyncio import AsyncioHTTPTransport
 
-    httpsserver.serve_content(code=202, content='', headers={'Location': 'http://example.com/foo'})
-    transport = AsyncioHTTPTransport(urlparse(httpsserver.url), verify_server_cert=False)
+    waiting_httpsserver.serve_content(code=202, content='', headers={'Location': 'http://example.com/foo'})
+    transport = AsyncioHTTPTransport(urlparse(waiting_httpsserver.url), verify_server_cert=False)
     url = await transport.send(b'x', {})
     assert url == 'http://example.com/foo'

tests/fixtures.py

@@ -102,6 +102,12 @@ def waiting_httpserver(httpserver):
     return httpserver
 
 
+@pytest.fixture()
+def waiting_httpsserver(httpsserver):
+    wait_for_http_server(httpsserver)
+    return httpsserver
+
+
 @pytest.fixture()
 def validating_httpserver(request):
     server = ValidatingWSGIApp()

tests/transports/test_urllib3.py

@@ -17,9 +17,9 @@
 responses = Responses('urllib3')
 
 
-def test_send(httpserver):
-    httpserver.serve_content(code=202, content='', headers={'Location': 'http://example.com/foo'})
-    transport = Transport(urlparse.urlparse(httpserver.url))
+def test_send(waiting_httpserver):
+    waiting_httpserver.serve_content(code=202, content='', headers={'Location': 'http://example.com/foo'})
+    transport = Transport(urlparse.urlparse(waiting_httpserver.url))
     url = transport.send(compat.b('x'), {})
     assert url == 'http://example.com/foo'
 
@@ -34,9 +34,9 @@ def test_timeout():
     assert 'timeout' in str(exc_info.value)
 
 
-def test_http_error(httpserver):
-    httpserver.serve_content(code=418, content="I'm a teapot")
-    transport = Transport(urlparse.urlparse(httpserver.url))
+def test_http_error(waiting_httpserver):
+    waiting_httpserver.serve_content(code=418, content="I'm a teapot")
+    transport = Transport(urlparse.urlparse(waiting_httpserver.url))
 
     with pytest.raises(TransportException) as exc_info:
         transport.send('x', {})
@@ -98,17 +98,17 @@ def test_header_encodings():
         assert isinstance(v, compat.binary_type)
 
 
-def test_ssl_verify_fails(httpsserver):
-    httpsserver.serve_content(code=202, content='', headers={'Location': 'http://example.com/foo'})
-    transport = Transport(compat.urlparse.urlparse(httpsserver.url))
+def test_ssl_verify_fails(waiting_httpsserver):
+    waiting_httpsserver.serve_content(code=202, content='', headers={'Location': 'http://example.com/foo'})
+    transport = Transport(compat.urlparse.urlparse(waiting_httpsserver.url))
     with pytest.raises(TransportException) as exc_info:
         url = transport.send(compat.b('x'), {})
     assert 'CERTIFICATE_VERIFY_FAILED' in str(exc_info)
 
 
 @pytest.mark.filterwarnings('ignore:Unverified HTTPS')
-def test_ssl_verify_disable(httpsserver):
-    httpsserver.serve_content(code=202, content='', headers={'Location': 'https://example.com/foo'})
-    transport = Transport(compat.urlparse.urlparse(httpsserver.url), verify_server_cert=False)
+def test_ssl_verify_disable(waiting_httpsserver):
+    waiting_httpsserver.serve_content(code=202, content='', headers={'Location': 'https://example.com/foo'})
+    transport = Transport(compat.urlparse.urlparse(waiting_httpsserver.url), verify_server_cert=False)
     url = transport.send(compat.b('x'), {})
     assert url == 'https://example.com/foo'