Skip to content

Commit 0ab3cda

Browse files
authored
make core tests offline (Azure#19986)
* make core tests offline * clean up * use localhost instead of 127.0.0.1 * update * update * update
1 parent 56475b0 commit 0ab3cda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+708
-598
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ async def __aenter__(self):
6666
return self
6767

6868
async def __aexit__(self, *exc_details) -> None:
69-
await self._client.__aexit__(*exc_details)
69+
await self._client.__aexit__(*exc_details)

sdk/core/azure-core/tests/async_tests/test_basic_transport_async.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
# Licensed under the MIT License. See LICENSE.txt in the project root for
44
# license information.
55
# -------------------------------------------------------------------------
6-
from six.moves.http_client import HTTPConnection
7-
import time
8-
9-
try:
10-
from unittest import mock
11-
except ImportError:
12-
import mock
13-
146
from azure.core.pipeline.transport import HttpRequest, AsyncHttpResponse, AsyncHttpTransport, AioHttpTransport
157
from azure.core.pipeline.policies import HeadersPolicy
168
from azure.core.pipeline import AsyncPipeline
@@ -42,9 +34,9 @@ def body(self):
4234

4335

4436
@pytest.mark.asyncio
45-
async def test_basic_options_aiohttp():
37+
async def test_basic_options_aiohttp(port):
4638

47-
request = HttpRequest("OPTIONS", "https://httpbin.org")
39+
request = HttpRequest("OPTIONS", "http://localhost:{}/basic/string".format(port))
4840
async with AsyncPipeline(AioHttpTransport(), policies=[]) as pipeline:
4941
response = await pipeline.run(request)
5042

sdk/core/azure-core/tests/async_tests/test_http_logging_policy_async.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def emit(self, record):
4141

4242
policy = HttpLoggingPolicy(logger=logger)
4343

44-
universal_request = HttpRequest('GET', 'http://127.0.0.1/')
44+
universal_request = HttpRequest('GET', 'http://localhost/')
4545
http_response = HttpResponse(universal_request, None)
4646
http_response.status_code = 202
4747
request = PipelineRequest(universal_request, PipelineContext(None))
@@ -54,7 +54,7 @@ def emit(self, record):
5454

5555
assert all(m.levelname == 'INFO' for m in mock_handler.messages)
5656
assert len(mock_handler.messages) == 6
57-
assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
57+
assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
5858
assert mock_handler.messages[1].message == "Request method: 'GET'"
5959
assert mock_handler.messages[2].message == 'Request headers:'
6060
assert mock_handler.messages[3].message == 'No body was attached to the request'
@@ -75,13 +75,13 @@ def emit(self, record):
7575

7676
assert all(m.levelname == 'INFO' for m in mock_handler.messages)
7777
assert len(mock_handler.messages) == 12
78-
assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
78+
assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
7979
assert mock_handler.messages[1].message == "Request method: 'GET'"
8080
assert mock_handler.messages[2].message == 'Request headers:'
8181
assert mock_handler.messages[3].message == 'No body was attached to the request'
8282
assert mock_handler.messages[4].message == 'Response status: 202'
8383
assert mock_handler.messages[5].message == 'Response headers:'
84-
assert mock_handler.messages[6].message == "Request URL: 'http://127.0.0.1/'"
84+
assert mock_handler.messages[6].message == "Request URL: 'http://localhost/'"
8585
assert mock_handler.messages[7].message == "Request method: 'GET'"
8686
assert mock_handler.messages[8].message == 'Request headers:'
8787
assert mock_handler.messages[9].message == 'No body was attached to the request'
@@ -102,15 +102,15 @@ def emit(self, record):
102102
"Content-Type": "Caramel",
103103
"HateToo": "Chocolat",
104104
}
105-
universal_request.url = "http://127.0.0.1/?country=france&city=aix"
105+
universal_request.url = "http://localhost/?country=france&city=aix"
106106

107107
policy.on_request(request)
108108
response = PipelineResponse(request, http_response, request.context)
109109
policy.on_response(request, response)
110110

111111
assert all(m.levelname == 'INFO' for m in mock_handler.messages)
112112
assert len(mock_handler.messages) == 10
113-
assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/?country=france&city=REDACTED'"
113+
assert mock_handler.messages[0].message == "Request URL: 'http://localhost/?country=france&city=REDACTED'"
114114
assert mock_handler.messages[1].message == "Request method: 'GET'"
115115
assert mock_handler.messages[2].message == "Request headers:"
116116
# Dict not ordered in Python, exact logging order doesn't matter
@@ -156,7 +156,7 @@ def emit(self, record):
156156
policy = HttpLoggingPolicy()
157157
kwargs={'logger': logger}
158158

159-
universal_request = HttpRequest('GET', 'http://127.0.0.1/')
159+
universal_request = HttpRequest('GET', 'http://localhost/')
160160
http_response = HttpResponse(universal_request, None)
161161
http_response.status_code = 202
162162
request = PipelineRequest(universal_request, PipelineContext(None, **kwargs))
@@ -169,7 +169,7 @@ def emit(self, record):
169169

170170
assert all(m.levelname == 'INFO' for m in mock_handler.messages)
171171
assert len(mock_handler.messages) == 6
172-
assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
172+
assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
173173
assert mock_handler.messages[1].message == "Request method: 'GET'"
174174
assert mock_handler.messages[2].message == 'Request headers:'
175175
assert mock_handler.messages[3].message == 'No body was attached to the request'
@@ -192,13 +192,13 @@ def emit(self, record):
192192

193193
assert all(m.levelname == 'INFO' for m in mock_handler.messages)
194194
assert len(mock_handler.messages) == 12
195-
assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
195+
assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
196196
assert mock_handler.messages[1].message == "Request method: 'GET'"
197197
assert mock_handler.messages[2].message == 'Request headers:'
198198
assert mock_handler.messages[3].message == 'No body was attached to the request'
199199
assert mock_handler.messages[4].message == 'Response status: 202'
200200
assert mock_handler.messages[5].message == 'Response headers:'
201-
assert mock_handler.messages[6].message == "Request URL: 'http://127.0.0.1/'"
201+
assert mock_handler.messages[6].message == "Request URL: 'http://localhost/'"
202202
assert mock_handler.messages[7].message == "Request method: 'GET'"
203203
assert mock_handler.messages[8].message == 'Request headers:'
204204
assert mock_handler.messages[9].message == 'No body was attached to the request'
@@ -226,7 +226,7 @@ def emit(self, record):
226226

227227
policy = HttpLoggingPolicy(logger=logger)
228228

229-
universal_request = HttpRequest('GET', 'http://127.0.0.1/')
229+
universal_request = HttpRequest('GET', 'http://localhost/')
230230
universal_request.body = "testbody"
231231
http_response = HttpResponse(universal_request, None)
232232
http_response.status_code = 202
@@ -238,7 +238,7 @@ def emit(self, record):
238238

239239
assert all(m.levelname == 'INFO' for m in mock_handler.messages)
240240
assert len(mock_handler.messages) == 6
241-
assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
241+
assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
242242
assert mock_handler.messages[1].message == "Request method: 'GET'"
243243
assert mock_handler.messages[2].message == 'Request headers:'
244244
assert mock_handler.messages[3].message == 'A body is sent with the request'
@@ -267,7 +267,7 @@ def emit(self, record):
267267

268268
policy = HttpLoggingPolicy(logger=logger)
269269

270-
universal_request = HttpRequest('GET', 'http://127.0.0.1/')
270+
universal_request = HttpRequest('GET', 'http://localhost/')
271271
mock = Mock()
272272
mock.__class__ = types.AsyncGeneratorType
273273
universal_request.body = mock
@@ -281,7 +281,7 @@ def emit(self, record):
281281

282282
assert all(m.levelname == 'INFO' for m in mock_handler.messages)
283283
assert len(mock_handler.messages) == 6
284-
assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'"
284+
assert mock_handler.messages[0].message == "Request URL: 'http://localhost/'"
285285
assert mock_handler.messages[1].message == "Request method: 'GET'"
286286
assert mock_handler.messages[2].message == 'Request headers:'
287287
assert mock_handler.messages[3].message == 'File upload'

sdk/core/azure-core/tests/async_tests/test_pipeline_async.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,10 @@ def on_exception(self, requests, **kwargs):
8888
with pytest.raises(NotImplementedError):
8989
await pipeline.run(req)
9090

91-
9291
@pytest.mark.asyncio
93-
async def test_basic_aiohttp():
92+
async def test_basic_aiohttp(port):
9493

95-
request = HttpRequest("GET", "https://bing.com")
94+
request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
9695
policies = [
9796
UserAgentPolicy("myusergant"),
9897
AsyncRedirectPolicy()
@@ -105,10 +104,10 @@ async def test_basic_aiohttp():
105104
assert isinstance(response.http_response.status_code, int)
106105

107106
@pytest.mark.asyncio
108-
async def test_basic_aiohttp_separate_session():
107+
async def test_basic_aiohttp_separate_session(port):
109108

110109
session = aiohttp.ClientSession()
111-
request = HttpRequest("GET", "https://bing.com")
110+
request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
112111
policies = [
113112
UserAgentPolicy("myusergant"),
114113
AsyncRedirectPolicy()
@@ -124,9 +123,9 @@ async def test_basic_aiohttp_separate_session():
124123
await transport.session.close()
125124

126125
@pytest.mark.asyncio
127-
async def test_basic_async_requests():
126+
async def test_basic_async_requests(port):
128127

129-
request = HttpRequest("GET", "https://bing.com")
128+
request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
130129
policies = [
131130
UserAgentPolicy("myusergant"),
132131
AsyncRedirectPolicy()
@@ -186,9 +185,9 @@ def test_pass_in_http_logging_policy():
186185
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"})
187186

188187
@pytest.mark.asyncio
189-
async def test_conf_async_requests():
188+
async def test_conf_async_requests(port):
190189

191-
request = HttpRequest("GET", "https://bing.com/")
190+
request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
192191
policies = [
193192
UserAgentPolicy("myusergant"),
194193
AsyncRedirectPolicy()
@@ -198,10 +197,10 @@ async def test_conf_async_requests():
198197

199198
assert isinstance(response.http_response.status_code, int)
200199

201-
def test_conf_async_trio_requests():
200+
def test_conf_async_trio_requests(port):
202201

203202
async def do():
204-
request = HttpRequest("GET", "https://bing.com/")
203+
request = HttpRequest("GET", "http://localhost:{}/basic/string".format(port))
205204
policies = [
206205
UserAgentPolicy("myusergant"),
207206
AsyncRedirectPolicy()

sdk/core/azure-core/tests/async_tests/test_request_asyncio.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
@pytest.mark.asyncio
14-
async def test_async_gen_data():
14+
async def test_async_gen_data(port):
1515
class AsyncGen:
1616
def __init__(self):
1717
self._range = iter([b"azerty"])
@@ -26,14 +26,13 @@ async def __anext__(self):
2626
raise StopAsyncIteration
2727

2828
async with AsyncioRequestsTransport() as transport:
29-
req = HttpRequest('GET', 'http://httpbin.org/anything', data=AsyncGen())
29+
req = HttpRequest('GET', 'http://localhost:{}/basic/anything'.format(port), data=AsyncGen())
3030
response = await transport.send(req)
3131
assert json.loads(response.text())['data'] == "azerty"
3232

3333
@pytest.mark.asyncio
34-
async def test_send_data():
34+
async def test_send_data(port):
3535
async with AsyncioRequestsTransport() as transport:
36-
req = HttpRequest('PUT', 'http://httpbin.org/anything', data=b"azerty")
36+
req = HttpRequest('PUT', 'http://localhost:{}/basic/anything'.format(port), data=b"azerty")
3737
response = await transport.send(req)
38-
39-
assert json.loads(response.text())['data'] == "azerty"
38+
assert json.loads(response.text())['data'] == "azerty"

sdk/core/azure-core/tests/async_tests/test_request_trio.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
@pytest.mark.trio
14-
async def test_async_gen_data():
14+
async def test_async_gen_data(port):
1515
class AsyncGen:
1616
def __init__(self):
1717
self._range = iter([b"azerty"])
@@ -26,14 +26,14 @@ async def __anext__(self):
2626
raise StopAsyncIteration
2727

2828
async with TrioRequestsTransport() as transport:
29-
req = HttpRequest('GET', 'http://httpbin.org/anything', data=AsyncGen())
29+
req = HttpRequest('GET', 'http://localhost:{}/basic/anything'.format(port), data=AsyncGen())
3030
response = await transport.send(req)
3131
assert json.loads(response.text())['data'] == "azerty"
3232

3333
@pytest.mark.trio
34-
async def test_send_data():
34+
async def test_send_data(port):
3535
async with TrioRequestsTransport() as transport:
36-
req = HttpRequest('PUT', 'http://httpbin.org/anything', data=b"azerty")
36+
req = HttpRequest('PUT', 'http://localhost:{}/basic/anything'.format(port), data=b"azerty")
3737
response = await transport.send(req)
3838

3939
assert json.loads(response.text())['data'] == "azerty"
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
# Licensed under the MIT License. See LICENSE.txt in the project root for
44
# license information.
55
# -------------------------------------------------------------------------
6-
import json
7-
86
from azure.core.pipeline.transport import AsyncioRequestsTransport
97
from azure.core.rest import HttpRequest
108
from rest_client_async import AsyncTestRestClient
@@ -29,15 +27,15 @@ async def __anext__(self):
2927

3028
async with AsyncioRequestsTransport() as transport:
3129
client = AsyncTestRestClient(port, transport=transport)
32-
request = HttpRequest('GET', 'http://httpbin.org/anything', content=AsyncGen())
30+
request = HttpRequest('GET', 'http://localhost:{}/basic/anything'.format(port), content=AsyncGen())
3331
response = await client.send_request(request)
3432
assert response.json()['data'] == "azerty"
3533

3634
@pytest.mark.asyncio
3735
async def test_send_data(port):
3836
async with AsyncioRequestsTransport() as transport:
3937
client = AsyncTestRestClient(port, transport=transport)
40-
request = HttpRequest('PUT', 'http://httpbin.org/anything', content=b"azerty")
38+
request = HttpRequest('PUT', 'http://localhost:{}/basic/anything'.format(port), content=b"azerty")
4139
response = await client.send_request(request)
4240

43-
assert response.json()['data'] == "azerty"
41+
assert response.json()['data'] == "azerty"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Licensed under the MIT License. See LICENSE.txt in the project root for
55
# license information.
66
# -------------------------------------------------------------------------
7-
from azure.core.exceptions import HttpResponseError, ResponseNotReadError
7+
from azure.core.exceptions import ResponseNotReadError
88
import pytest
99
from azure.core.rest import HttpRequest
1010
from rest_client_async import AsyncTestRestClient
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ async def test_response_headers_case_insensitive(client):
3333
response.headers["cAMeLCaSE-hEadER"] ==
3434
"camelCase"
3535
)
36-
return response
36+
return response

0 commit comments

Comments
 (0)