Merge pull request #176 from klauer/dev_conda

BLD: epicsmacrolib is now on conda-forge

conda-recipe/meta.yaml

@@ -23,6 +23,7 @@ requirements:
   - python >=3.9
   - aiohttp
   - apischema
+  - epicsmacrolib
   - graphviz
   - jinja2
   - lark-parser
@@ -35,7 +36,7 @@ test:
     - flake8
     - happi
     - pytest
-    - pytest-aiohttp
+    - pytest-asyncio
     - pytest-cov
     - python-ldap
     - pytmc

dev-requirements.txt

@@ -3,7 +3,7 @@
 codecov
 flake8
 pytest
-pytest-aiohttp
+pytest-asyncio
 pytest-cov
 
 # plugin dependencies

whatrecord/tests/test_server_handler.py

@@ -1,14 +1,17 @@
 """Requires pytest-aiohttp"""
 import json
 import logging
-from typing import Any, Dict, Optional, Type, TypeVar
+from typing import (Any, Awaitable, Callable, Dict, Generator, Optional, Type,
+                    TypeVar, Union)
 
 import aiohttp
 import aiohttp.test_utils
 import aiohttp.web
 import apischema
 import pytest
 import pytest_asyncio
+from aiohttp.test_utils import BaseTestServer, TestClient, TestServer
+from aiohttp.web import Application
 
 from .. import gateway
 from ..common import RecordInstance, WhatRecord
@@ -22,6 +25,8 @@
 
 from .test_server_state import ready_state, state  # noqa
 
+AiohttpClient = Callable[[Union[Application, BaseTestServer]], Awaitable[TestClient]]
+
 
 @pytest.fixture()
 def handler(ready_state: ServerState) -> ServerHandler:   # noqa: F811
@@ -37,6 +42,45 @@ def server(handler: ServerHandler) -> aiohttp.web.Application:
     return app
 
 
+@pytest_asyncio.fixture
+async def aiohttp_client() -> Generator[AiohttpClient, None, None]:
+    """
+    Factory to create a TestClient instance.
+
+    Borrowed and modified from pytest-aiohttp, as a recent version is
+    unavailable on conda-forge for our testing purposes.
+
+    aiohttp_client(app, **kwargs)
+    aiohttp_client(server, **kwargs)
+    aiohttp_client(raw_server, **kwargs)
+    """
+    clients = []
+
+    async def go(
+        __param: Union[Application, BaseTestServer],
+        *,
+        server_kwargs: Optional[Dict[str, Any]] = None,
+        **kwargs: Any,
+    ) -> TestClient:
+        if isinstance(__param, Application):
+            server_kwargs = server_kwargs or {}
+            server = TestServer(__param, **server_kwargs)
+            client = TestClient(server, **kwargs)
+        elif isinstance(__param, BaseTestServer):
+            client = TestClient(__param, **kwargs)
+        else:
+            raise ValueError(f"Unknown argument type: {type(__param)}")
+
+        await client.start_server()
+        clients.append(client)
+        return client
+
+    yield go
+
+    while clients:
+        await clients.pop().close()
+
+
 @pytest_asyncio.fixture()
 async def client(server: aiohttp.web.Application, aiohttp_client):
     return await aiohttp_client(server)