make core tests offline (#19986)

* make core tests offline * clean up * use localhost instead of 127.0.0.1 * update * update * update
Azure · Aug 25, 2021 · 0ab3cda · 0ab3cda
1 parent 56475b0
commit 0ab3cda
Show file tree

Hide file tree

Showing 49 changed files with 708 additions and 598 deletions.
diff --git a/.../testserver_tests/async_tests/conftest.py → .../azure-core/tests/async_tests/conftest.py b/.../testserver_tests/async_tests/conftest.py → .../azure-core/tests/async_tests/conftest.py
diff --git a/...er_tests/async_tests/rest_client_async.py → ...re/tests/async_tests/rest_client_async.py b/...er_tests/async_tests/rest_client_async.py → ...re/tests/async_tests/rest_client_async.py
@@ -66,4 +66,4 @@ async def __aenter__(self):
         return self
 
     async def __aexit__(self, *exc_details) -> None:
-        await self._client.__aexit__(*exc_details)
+        await self._client.__aexit__(*exc_details)
diff --git a/sdk/core/azure-core/tests/async_tests/test_basic_transport_async.py b/sdk/core/azure-core/tests/async_tests/test_basic_transport_async.py
@@ -3,14 +3,6 @@
 # Licensed under the MIT License. See LICENSE.txt in the project root for
 # license information.
 # -------------------------------------------------------------------------
-from six.moves.http_client import HTTPConnection
-import time
-
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
 from azure.core.pipeline.transport import HttpRequest, AsyncHttpResponse, AsyncHttpTransport, AioHttpTransport
 from azure.core.pipeline.policies import HeadersPolicy
 from azure.core.pipeline import AsyncPipeline
@@ -42,9 +34,9 @@ def body(self):
 
 
 @pytest.mark.asyncio
-async def test_basic_options_aiohttp():
+async def test_basic_options_aiohttp(port):
 
-    request = HttpRequest("OPTIONS", "https://httpbin.org")
+    request = HttpRequest("OPTIONS", "http://localhost:{}/basic/string".format(port))
     async with AsyncPipeline(AioHttpTransport(), policies=[]) as pipeline:
         response = await pipeline.run(request)
 

diff --git a/sdk/core/azure-core/tests/async_tests/test_http_logging_policy_async.py b/sdk/core/azure-core/tests/async_tests/test_http_logging_policy_async.py
@@ -41,7 +41,7 @@ def emit(self, record):
 
     policy = HttpLoggingPolicy(logger=logger)
 
-    universal_request = HttpRequest('GET', 'http://127.0.0.1/')
+    universal_request = HttpRequest('GET', 'http://localhost/')
     http_response = HttpResponse(universal_request, None)
     http_response.status_code = 202
     request = PipelineRequest(universal_request, PipelineContext(None))
@@ -54,7 +54,7 @@ def emit(self, record):
 
     assert all(m.levelname == 'INFO' for m in mock_handler.messages)
     assert len(mock_handler.messages) == 6
-    assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
+    assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
     assert mock_handler.messages[1].message == "Request method: 'GET'"
     assert mock_handler.messages[2].message == 'Request headers:'
     assert mock_handler.messages[3].message == 'No body was attached to the request'
@@ -75,13 +75,13 @@ def emit(self, record):
 
     assert all(m.levelname == 'INFO' for m in mock_handler.messages)
     assert len(mock_handler.messages) == 12
-    assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
+    assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
     assert mock_handler.messages[1].message == "Request method: 'GET'"
     assert mock_handler.messages[2].message == 'Request headers:'
     assert mock_handler.messages[3].message == 'No body was attached to the request'
     assert mock_handler.messages[4].message == 'Response status: 202'
     assert mock_handler.messages[5].message == 'Response headers:'
-    assert mock_handler.messages[6].message == "Request URL: 'http://127.0.0.1/'"
+    assert mock_handler.messages[6].message == "Request URL: 'http://localhost/'"
     assert mock_handler.messages[7].message == "Request method: 'GET'"
     assert mock_handler.messages[8].message == 'Request headers:'
     assert mock_handler.messages[9].message == 'No body was attached to the request'
@@ -102,15 +102,15 @@ def emit(self, record):
         "Content-Type": "Caramel",
         "HateToo": "Chocolat",
     }
-    universal_request.url = "http://127.0.0.1/?country=france&city=aix"
+    universal_request.url = "http://localhost/?country=france&city=aix"
 
     policy.on_request(request)
     response = PipelineResponse(request, http_response, request.context)
     policy.on_response(request, response)
 
     assert all(m.levelname == 'INFO' for m in mock_handler.messages)
     assert len(mock_handler.messages) == 10
-    assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/?country=france&city=REDACTED'"
+    assert mock_handler.messages[0].message == "Request URL: 'http://localhost/?country=france&city=REDACTED'"
     assert mock_handler.messages[1].message == "Request method: 'GET'"
     assert mock_handler.messages[2].message == "Request headers:"
     # Dict not ordered in Python, exact logging order doesn't matter
@@ -156,7 +156,7 @@ def emit(self, record):
     policy = HttpLoggingPolicy()
     kwargs={'logger': logger}
 
-    universal_request = HttpRequest('GET', 'http://127.0.0.1/')
+    universal_request = HttpRequest('GET', 'http://localhost/')
     http_response = HttpResponse(universal_request, None)
     http_response.status_code = 202
     request = PipelineRequest(universal_request, PipelineContext(None, **kwargs))
@@ -169,7 +169,7 @@ def emit(self, record):
 
     assert all(m.levelname == 'INFO' for m in mock_handler.messages)
     assert len(mock_handler.messages) == 6
-    assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
+    assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
     assert mock_handler.messages[1].message == "Request method: 'GET'"
     assert mock_handler.messages[2].message == 'Request headers:'
     assert mock_handler.messages[3].message == 'No body was attached to the request'
@@ -192,13 +192,13 @@ def emit(self, record):
 
     assert all(m.levelname == 'INFO' for m in mock_handler.messages)
     assert len(mock_handler.messages) == 12
-    assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
+    assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
     assert mock_handler.messages[1].message == "Request method: 'GET'"
     assert mock_handler.messages[2].message == 'Request headers:'
     assert mock_handler.messages[3].message == 'No body was attached to the request'
     assert mock_handler.messages[4].message == 'Response status: 202'
     assert mock_handler.messages[5].message == 'Response headers:'
-    assert mock_handler.messages[6].message == "Request URL: 'http://127.0.0.1/'"
+    assert mock_handler.messages[6].message == "Request URL: 'http://localhost/'"
     assert mock_handler.messages[7].message == "Request method: 'GET'"
     assert mock_handler.messages[8].message == 'Request headers:'
     assert mock_handler.messages[9].message == 'No body was attached to the request'
@@ -226,7 +226,7 @@ def emit(self, record):
 
     policy = HttpLoggingPolicy(logger=logger)
 
-    universal_request = HttpRequest('GET', 'http://127.0.0.1/')
+    universal_request = HttpRequest('GET', 'http://localhost/')
     universal_request.body = "testbody"
     http_response = HttpResponse(universal_request, None)
     http_response.status_code = 202
@@ -238,7 +238,7 @@ def emit(self, record):
 
     assert all(m.levelname == 'INFO' for m in mock_handler.messages)
     assert len(mock_handler.messages) == 6
-    assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
+    assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
     assert mock_handler.messages[1].message == "Request method: 'GET'"
     assert mock_handler.messages[2].message == 'Request headers:'
     assert mock_handler.messages[3].message == 'A body is sent with the request'
@@ -267,7 +267,7 @@ def emit(self, record):
 
     policy = HttpLoggingPolicy(logger=logger)
 
-    universal_request = HttpRequest('GET', 'http://127.0.0.1/')
+    universal_request = HttpRequest('GET', 'http://localhost/')
     mock = Mock()
     mock.__class__ = types.AsyncGeneratorType
     universal_request.body = mock
@@ -281,7 +281,7 @@ def emit(self, record):
 
     assert all(m.levelname == 'INFO' for m in mock_handler.messages)
     assert len(mock_handler.messages) == 6
-    assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
+    assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
     assert mock_handler.messages[1].message == "Request method: 'GET'"
     assert mock_handler.messages[2].message == 'Request headers:'
     assert mock_handler.messages[3].message == 'File upload'

diff --git a/sdk/core/azure-core/tests/async_tests/test_pipeline_async.py b/sdk/core/azure-core/tests/async_tests/test_pipeline_async.py
@@ -88,11 +88,10 @@ def on_exception(self, requests, **kwargs):
     with pytest.raises(NotImplementedError):
         await pipeline.run(req)
 
-
 @pytest.mark.asyncio
-async def test_basic_aiohttp():
+async def test_basic_aiohttp(port):
 
-    request = HttpRequest("GET", "https://bing.com")
+    request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
     policies = [
         UserAgentPolicy("myusergant"),
         AsyncRedirectPolicy()
@@ -105,10 +104,10 @@ async def test_basic_aiohttp():
     assert isinstance(response.http_response.status_code, int)
 
 @pytest.mark.asyncio
-async def test_basic_aiohttp_separate_session():
+async def test_basic_aiohttp_separate_session(port):
 
     session = aiohttp.ClientSession()
-    request = HttpRequest("GET", "https://bing.com")
+    request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
     policies = [
         UserAgentPolicy("myusergant"),
         AsyncRedirectPolicy()
@@ -124,9 +123,9 @@ async def test_basic_aiohttp_separate_session():
     await transport.session.close()
 
 @pytest.mark.asyncio
-async def test_basic_async_requests():
+async def test_basic_async_requests(port):
 
-    request = HttpRequest("GET", "https://bing.com")
+    request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
     policies = [
         UserAgentPolicy("myusergant"),
         AsyncRedirectPolicy()
@@ -186,9 +185,9 @@ def test_pass_in_http_logging_policy():
     assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"})
 
 @pytest.mark.asyncio
-async def test_conf_async_requests():
+async def test_conf_async_requests(port):
 
-    request = HttpRequest("GET", "https://bing.com/")
+    request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
     policies = [
         UserAgentPolicy("myusergant"),
         AsyncRedirectPolicy()
@@ -198,10 +197,10 @@ async def test_conf_async_requests():
 
     assert isinstance(response.http_response.status_code, int)
 
-def test_conf_async_trio_requests():
+def test_conf_async_trio_requests(port):
 
     async def do():
-        request = HttpRequest("GET", "https://bing.com/")
+        request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
         policies = [
             UserAgentPolicy("myusergant"),
             AsyncRedirectPolicy()

diff --git a/sdk/core/azure-core/tests/async_tests/test_request_asyncio.py b/sdk/core/azure-core/tests/async_tests/test_request_asyncio.py
@@ -11,7 +11,7 @@
 
 
 @pytest.mark.asyncio
-async def test_async_gen_data():
+async def test_async_gen_data(port):
     class AsyncGen:
         def __init__(self):
             self._range = iter([b"azerty"])
@@ -26,14 +26,13 @@ async def __anext__(self):
                 raise StopAsyncIteration
 
     async with AsyncioRequestsTransport() as transport:
-        req = HttpRequest('GET', 'http://httpbin.org/anything', data=AsyncGen())
+        req = HttpRequest('GET', 'http://localhost:{}/basic/anything'.format(port), data=AsyncGen())
         response = await transport.send(req)
         assert json.loads(response.text())['data'] == "azerty"
 
 @pytest.mark.asyncio
-async def test_send_data():
+async def test_send_data(port):
     async with AsyncioRequestsTransport() as transport:
-        req = HttpRequest('PUT', 'http://httpbin.org/anything', data=b"azerty")
+        req = HttpRequest('PUT', 'http://localhost:{}/basic/anything'.format(port), data=b"azerty")
         response = await transport.send(req)
-
-        assert json.loads(response.text())['data'] == "azerty"
+        assert json.loads(response.text())['data'] == "azerty"
diff --git a/sdk/core/azure-core/tests/async_tests/test_request_trio.py b/sdk/core/azure-core/tests/async_tests/test_request_trio.py
@@ -11,7 +11,7 @@
 
 
 @pytest.mark.trio
-async def test_async_gen_data():
+async def test_async_gen_data(port):
     class AsyncGen:
         def __init__(self):
             self._range = iter([b"azerty"])
@@ -26,14 +26,14 @@ async def __anext__(self):
                 raise StopAsyncIteration
 
     async with TrioRequestsTransport() as transport:
-        req = HttpRequest('GET', 'http://httpbin.org/anything', data=AsyncGen())
+        req = HttpRequest('GET', 'http://localhost:{}/basic/anything'.format(port), data=AsyncGen())
         response = await transport.send(req)
         assert json.loads(response.text())['data'] == "azerty"
 
 @pytest.mark.trio
-async def test_send_data():
+async def test_send_data(port):
     async with TrioRequestsTransport() as transport:
-        req = HttpRequest('PUT', 'http://httpbin.org/anything', data=b"azerty")
+        req = HttpRequest('PUT', 'http://localhost:{}/basic/anything'.format(port), data=b"azerty")
         response = await transport.send(req)
 
         assert json.loads(response.text())['data'] == "azerty"
diff --git a/...sync_tests/test_rest_asyncio_transport.py → ...sync_tests/test_rest_asyncio_transport.py b/...sync_tests/test_rest_asyncio_transport.py → ...sync_tests/test_rest_asyncio_transport.py
@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See LICENSE.txt in the project root for
 # license information.
 # -------------------------------------------------------------------------
-import json
-
 from azure.core.pipeline.transport import AsyncioRequestsTransport
 from azure.core.rest import HttpRequest
 from rest_client_async import AsyncTestRestClient
@@ -29,15 +27,15 @@ async def __anext__(self):
 
     async with AsyncioRequestsTransport() as transport:
         client = AsyncTestRestClient(port, transport=transport)
-        request = HttpRequest('GET', 'http://httpbin.org/anything', content=AsyncGen())
+        request = HttpRequest('GET', 'http://localhost:{}/basic/anything'.format(port), content=AsyncGen())
         response = await client.send_request(request)
         assert response.json()['data'] == "azerty"
 
 @pytest.mark.asyncio
 async def test_send_data(port):
     async with AsyncioRequestsTransport() as transport:
         client = AsyncTestRestClient(port, transport=transport)
-        request = HttpRequest('PUT', 'http://httpbin.org/anything', content=b"azerty")
+        request = HttpRequest('PUT', 'http://localhost:{}/basic/anything'.format(port), content=b"azerty")
         response = await client.send_request(request)
 
-        assert response.json()['data'] == "azerty"
+        assert response.json()['data'] == "azerty"
diff --git a/..._tests/test_rest_context_manager_async.py → ..._tests/test_rest_context_manager_async.py b/..._tests/test_rest_context_manager_async.py → ..._tests/test_rest_context_manager_async.py
@@ -4,7 +4,7 @@
 # Licensed under the MIT License. See LICENSE.txt in the project root for
 # license information.
 # -------------------------------------------------------------------------
-from azure.core.exceptions import HttpResponseError, ResponseNotReadError
+from azure.core.exceptions import ResponseNotReadError
 import pytest
 from azure.core.rest import HttpRequest
 from rest_client_async import AsyncTestRestClient

diff --git a/...ts/async_tests/test_rest_headers_async.py → ...ts/async_tests/test_rest_headers_async.py b/...ts/async_tests/test_rest_headers_async.py → ...ts/async_tests/test_rest_headers_async.py
@@ -33,4 +33,4 @@ async def test_response_headers_case_insensitive(client):
         response.headers["cAMeLCaSE-hEadER"] ==
         "camelCase"
     )
-    return response
+    return response
diff --git a/...ync_tests/test_rest_http_request_async.py → ...ync_tests/test_rest_http_request_async.py b/...ync_tests/test_rest_http_request_async.py → ...ync_tests/test_rest_http_request_async.py
@@ -8,7 +8,6 @@
 # Thank you httpx for your wonderful tests!
 import pytest
 from azure.core.rest import HttpRequest
-from typing import AsyncGenerator
 import collections.abc
 
 @pytest.fixture
@@ -87,4 +86,4 @@ async def content():
     request = HttpRequest("POST", "http://example.org", content=content())
     await assert_aiterator_body(request, b"test 123")
     # in this case, request._data is what we end up passing to the requests transport
-    assert isinstance(request._data, collections.abc.AsyncIterable)
+    assert isinstance(request._data, collections.abc.AsyncIterable)
diff --git a/...nc_tests/test_rest_http_response_async.py → ...nc_tests/test_rest_http_response_async.py b/...nc_tests/test_rest_http_response_async.py → ...nc_tests/test_rest_http_response_async.py
diff --git a/...tests/test_rest_stream_responses_async.py → ...tests/test_rest_stream_responses_async.py b/...tests/test_rest_stream_responses_async.py → ...tests/test_rest_stream_responses_async.py
@@ -4,9 +4,6 @@
 # license information.
 # -------------------------------------------------------------------------
 from azure.core.exceptions import HttpResponseError, ServiceRequestError
-import functools
-import os
-import json
 import pytest
 from azure.core.rest import HttpRequest
 from azure.core.exceptions import StreamClosedError, StreamConsumedError, ResponseNotReadError

diff --git a/...s/async_tests/test_rest_trio_transport.py → ...s/async_tests/test_rest_trio_transport.py b/...s/async_tests/test_rest_trio_transport.py → ...s/async_tests/test_rest_trio_transport.py
@@ -27,15 +27,15 @@ async def __anext__(self):
 
     async with TrioRequestsTransport() as transport:
         client = AsyncTestRestClient(port, transport=transport)
-        request = HttpRequest('GET', 'http://httpbin.org/anything', content=AsyncGen())
+        request = HttpRequest('GET', 'http://localhost:{}/basic/anything'.format(port), content=AsyncGen())
         response = await client.send_request(request)
         assert response.json()['data'] == "azerty"
 
 @pytest.mark.trio
 async def test_send_data(port):
     async with TrioRequestsTransport() as transport:
-        request = HttpRequest('PUT', 'http://httpbin.org/anything', content=b"azerty")
+        request = HttpRequest('PUT', 'http://localhost:{}/basic/anything'.format(port), content=b"azerty")
         client = AsyncTestRestClient(port, transport=transport)
         response = await client.send_request(request)
 
-        assert response.json()['data'] == "azerty"
+        assert response.json()['data'] == "azerty"