moved over to testserver

Author: iscai-msft

sdk/core/azure-core/azure/core/pipeline/transport/_requests_basic.py

@@ -136,7 +136,7 @@ class RequestsTransportResponse(HttpResponse, _RequestsTransportResponseBase):
     """Streaming of data from the response.
     """
     def stream_download(self, pipeline, **kwargs):
-        # type: (PipelineType) -> Iterator[bytes]
+        # type: (PipelineType, Any) -> Iterator[bytes]
         """Generator for streaming request body data."""
         return StreamDownloadGenerator(pipeline, self, **kwargs)
 

sdk/core/azure-core/azure/core/rest/_rest_py3.py

@@ -46,6 +46,14 @@
 )
 from abc import abstractmethod
 from azure.core.exceptions import HttpResponseError
+from azure.core.pipeline import Pipeline, AsyncPipeline
+from azure.core.pipeline.transport import (
+    HttpRequest as _PipelineTransportHttpRequest,
+)
+
+from azure.core.pipeline.transport._base import (
+    _HttpResponseBase as _PipelineTransportHttpResponseBase
+)
 
 ################################### TYPES SECTION #########################
 
@@ -75,18 +83,6 @@
     Sequence[Tuple[str, FileType]]
 ]
 
-from azure.core.pipeline import Pipeline, AsyncPipeline
-from azure.core.pipeline.transport import (
-    HttpRequest as _PipelineTransportHttpRequest,
-)
-
-from azure.core.pipeline.transport._base import (
-    _HttpResponseBase as _PipelineTransportHttpResponseBase
-)
-
-from azure.core._pipeline_client import PipelineClient as _PipelineClient
-from azure.core._pipeline_client_async import AsyncPipelineClient as _AsyncPipelineClient
-
 class HttpVerbs(str, Enum):
     GET = "GET"
     PUT = "PUT"
@@ -111,7 +107,9 @@ def _lookup_encoding(encoding: str) -> bool:
     except LookupError:
         return False
 
-def _set_content_length_header(header_name: str, header_value: str, internal_request: _PipelineTransportHttpRequest) -> None:
+def _set_content_length_header(
+    header_name: str, header_value: str, internal_request: _PipelineTransportHttpRequest
+) -> None:
     valid_methods = ["put", "post", "patch"]
     content_length_headers = ["Content-Length", "Transfer-Encoding"]
     if (
@@ -326,8 +324,6 @@ def __init__(
         files: Optional[FilesType] = None,
         **kwargs
     ):
-        # type: (str, str, Any) -> None
-
         self._internal_request = kwargs.pop("_internal_request", _PipelineTransportHttpRequest(
             method=method,
             url=url,
@@ -475,7 +471,6 @@ def _get_charset_encoding(self) -> str:
 
     @encoding.setter
     def encoding(self, value: str) -> None:
-        # type: (str) -> None
         """Sets the response encoding"""
         self._encoding = value
 

sdk/core/azure-core/tests/test_rest/conftest.py

@@ -5,12 +5,10 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-
 import sys
 
 
 # Ignore async tests for Python < 3.5
 collect_ignore_glob = []
 if sys.version_info < (3, 5):
     collect_ignore_glob.append("test_async*.py")
-

sdk/core/azure-core/tests/test_rest/test_async_http_response.py

@@ -6,25 +6,20 @@
 
 # NOTE: These tests are heavily inspired from the httpx test suite: https://github.com/encode/httpx/tree/master/tests
 # Thank you httpx for your wonderful tests!
-import json
+import functools
 import pytest
 import aiohttp
 from azure.core.pipeline.transport import AioHttpTransport
 from azure.core.rest import HttpRequest, AsyncHttpResponse
 from azure.core.exceptions import HttpResponseError
 from typing import Any, Dict
+from testcase_async import _create_http_response
 
-async def _create_http_response(request=None):
-    internal_response = await AioHttpTransport().send(request._internal_request, stream=False)
-    response = AsyncHttpResponse(
-        request=request,
-        _internal_response=internal_response
-    )
-    return response
+create_http_response = functools.partial(_create_http_response, stream=False)
 
 @pytest.mark.asyncio
 async def test_response():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/basic/helloWorld/string"),
     )
 
@@ -40,7 +35,7 @@ async def test_response():
 
 @pytest.mark.asyncio
 async def test_response_content():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/basic/helloWorld/bytes"),
     )
 
@@ -54,7 +49,7 @@ async def test_response_content():
 
 @pytest.mark.asyncio
 async def test_response_text():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/basic/helloWorld/text"),
     )
 
@@ -70,7 +65,7 @@ async def test_response_text():
 
 @pytest.mark.asyncio
 async def test_response_html():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/basic/helloWorld/html"),
     )
 
@@ -83,19 +78,19 @@ async def test_response_html():
 
 @pytest.mark.asyncio
 async def test_raise_for_status():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/basic/helloWorld/text"),
     )
     response.raise_for_status()
 
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/errors/403"),
     )
     assert response.status_code == 403
     with pytest.raises(HttpResponseError):
         response.raise_for_status()
 
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/errors/500"),
     )
     assert response.status_code == 500
@@ -104,7 +99,7 @@ async def test_raise_for_status():
 
 @pytest.mark.asyncio
 async def test_response_repr():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/basic/helloWorld/text")
     )
     assert repr(response) == "<AsyncHttpResponse: 200 OK, Content-Type: text/plain; charset=utf-8>"
@@ -114,7 +109,7 @@ async def test_response_content_type_encoding():
     """
     Use the charset encoding in the Content-Type header if possible.
     """
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/latin-1")
     )
     await response.read()
@@ -128,7 +123,7 @@ async def test_response_autodetect_encoding():
     """
     Autodetect encoding if there is no Content-Type header.
     """
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/latin-1")
     )
     await response.read()
@@ -144,7 +139,7 @@ async def test_response_fallback_to_autodetect():
     """
     Fallback to autodetection if we get an invalid charset in the Content-Type header.
     """
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/latin-1")
     )
     await response.read()
@@ -161,7 +156,7 @@ async def test_response_no_charset_with_ascii_content():
     A response with ascii encoded content should decode correctly,
     even with no charset specified.
     """
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/basic/helloWorld/string"),
     )
 
@@ -181,7 +176,7 @@ async def test_response_no_charset_with_iso_8859_1_content():
     A response with ISO 8859-1 encoded content should decode correctly,
     even with no charset specified.
     """
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/iso-8859-1"),
     )
     content = await response.read()
@@ -194,7 +189,7 @@ async def test_response_no_charset_with_iso_8859_1_content():
 
 @pytest.mark.asyncio
 async def test_response_set_explicit_encoding():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/latin-1-string-with-utf-8"),
     )
     response.encoding = "latin-1"
@@ -205,15 +200,15 @@ async def test_response_set_explicit_encoding():
 
 @pytest.mark.asyncio
 async def test_json():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/basic/json"),
     )
     await response.read()
     assert response.json() == {"greeting": "hello", "recipient": "world"}
 
 @pytest.mark.asyncio
 async def test_json_with_specified_encoding():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/json"),
     )
     await response.read()
@@ -222,23 +217,23 @@ async def test_json_with_specified_encoding():
 
 @pytest.mark.asyncio
 async def test_emoji():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/emoji"),
     )
     await response.read()
     assert response.text == "👩"
 
 @pytest.mark.asyncio
 async def test_emoji_family_with_skin_tone_modifier():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/emoji-family-skin-tone-modifier"),
     )
     await response.read()
     assert response.text == "👩🏻‍👩🏽‍👧🏾‍👦🏿 SSN: 859-98-0987"
 
 @pytest.mark.asyncio
 async def test_korean_nfc():
-    response = await _create_http_response(
+    response = await create_http_response(
         request=HttpRequest("GET", "http://localhost:3000/encoding/korean"),
     )
     await response.read()

sdk/core/azure-core/tests/test_rest/test_async_stream_context_manager.py

@@ -54,7 +54,7 @@ async def test_stream_context_manager_error():
             with pytest.raises(ResponseNotReadError):
                 r.content
             await r.read()
-            assert str(e.value) == "HttpResponseError: 404 NOT FOUND"
+            assert str(e.value) == "Operation returned an invalid status 'NOT FOUND'"
             assert r.content == b''
     assert r.is_closed
     assert r.is_stream_consumed