Remove test client (#2009)

* Initial

* remove testmanager

* Resolve tests

sanic/app.py

@@ -34,7 +34,6 @@
     serve_multiple,
 )
 from sanic.static import register as static_register
-from sanic.testing import SanicASGITestClient, SanicTestClient
 from sanic.views import CompositionView
 from sanic.websocket import ConnectionClosed, WebSocketProtocol
 
@@ -87,6 +86,8 @@ def __init__(
         self.websocket_tasks: Set[Future] = set()
         self.named_request_middleware: Dict[str, MiddlewareType] = {}
         self.named_response_middleware: Dict[str, MiddlewareType] = {}
+        self._test_client = None
+        self._asgi_client = None
         # Register alternative method names
         self.go_fast = self.run
 
@@ -1032,11 +1033,21 @@ async def handle_request(self, request):
 
     @property
     def test_client(self):
-        return SanicTestClient(self)
+        if self._test_client:
+            return self._test_client
+        from sanic_testing.testing import SanicTestClient  # type: ignore
+
+        self._test_client = SanicTestClient(self)
+        return self._test_client
 
     @property
     def asgi_client(self):
-        return SanicASGITestClient(self)
+        if self._asgi_client:
+            return self._asgi_client
+        from sanic_testing.testing import SanicASGITestClient  # type: ignore
+
+        self._asgi_client = SanicASGITestClient(self)
+        return self._asgi_client
 
     # -------------------------------------------------------------------- #
     # Execution
@@ -1439,7 +1450,7 @@ async def _websocket_handler(
             pass
         finally:
             self.websocket_tasks.remove(fut)
-        await ws.close()
+            await ws.close()
 
     # -------------------------------------------------------------------- #
     # ASGI

setup.py

@@ -89,15 +89,14 @@ def open_local(paths, mode="r", encoding="utf8"):
     "aiofiles>=0.6.0",
     "websockets>=8.1,<9.0",
     "multidict>=5.0,<6.0",
-    "httpx==0.15.4",
 ]
 
 tests_require = [
+    "sanic-testing",
     "pytest==5.2.1",
     "multidict>=5.0,<6.0",
     "gunicorn==20.0.4",
     "pytest-cov",
-    "httpcore==0.11.*",
     "beautifulsoup4",
     uvloop,
     ujson,

tests/conftest.py

@@ -6,6 +6,8 @@
 
 import pytest
 
+from sanic_testing import TestManager
+
 from sanic import Sanic
 from sanic.router import RouteExists, Router
 
@@ -17,6 +19,11 @@
     collect_ignore = ["test_worker.py"]
 
 
+@pytest.fixture
+def caplog(caplog):
+    yield caplog
+
+
 async def _handler(request):
     """
     Dummy placeholder method used for route resolver when creating a new
@@ -127,6 +134,8 @@ def url_param_generator():
     return TYPE_TO_GENERATOR_MAP
 
 
-@pytest.fixture
+@pytest.fixture(scope="function")
 def app(request):
-    return Sanic(request.node.name)
+    app = Sanic(request.node.name)
+    # TestManager(app)
+    return app

tests/test_asgi.py

@@ -41,8 +41,7 @@ def transport(message_stack, receive, send):
 
 
 @pytest.fixture
-# @pytest.mark.asyncio
-def protocol(transport, loop):
+def protocol(transport):
     return transport.get_protocol()