Tests for aries_webhook_server

* includes some additions to the actual class to
  * raise exceptions instead of logging them only
* Generally need to think up a good way of testing the methods with
pubsub throughout

Author: morrieinmaas

libs/aries-basic-controller/aries_basic_controller/aries_webhook_server.py

@@ -51,8 +51,11 @@ async def listen_webhooks(self):
                 self.webhook_host,
                 self.webhook_port)
             await self.webhook_site.start()
+            logger.info(
+                f"Listening Webhooks on {self.webhook_host}:{self.webhook_port}")
         except Exception as exc:
             logger.warning(f"Listening webhooks failed! {exc!r} occurred.")
+            raise
 
     async def _receive_webhook(self, request: ClientRequest):
         """Helper to receive webhooks by requesting it
@@ -79,6 +82,7 @@ async def _receive_webhook(self, request: ClientRequest):
             return web.Response(status=200)
         except Exception as exc:
             logger.warning(f"Receiving webhooks failed! {exc!r} occurred.")
+            raise
 
     async def _handle_webhook(self, wallet_id, topic, payload):
         """Helper handling a webhook
@@ -103,6 +107,7 @@ async def _handle_webhook(self, wallet_id, topic, payload):
             logger.warning(
                 (f"Handling webhooks failed! {exc!r} occurred"
                     f" when trying to handle this topic: {topic}"))
+            raise
 
     async def terminate(self):
         """Terminate the controller client session and webhook listeners"""
@@ -115,3 +120,4 @@ async def terminate(self):
         except Exception as exc:
             logger.warning(
                 f"Terminating webhooks listener failed! {exc!r} occurred.")
+            raise

libs/aries-basic-controller/aries_basic_controller/scrap.py

@@ -14,7 +14,7 @@
 LOGGER = logging.getLogger(__name__)
 
 
-class TestAriesAgentControllerBase():
+class TestAriesAgentController():
 
     admin_url = "0.0.0.0"
     webhook_host = ""

libs/aries-basic-controller/aries_basic_controller/tests/test_aries_controller.py

@@ -15,7 +15,7 @@
 LOGGER = logging.getLogger(__name__)
 
 
-class TestAriesAgentControllerBase():
+class TestAriesTenantController():
 
     admin_url = "0.0.0.0"
     webhook_host = ""

libs/aries-basic-controller/aries_basic_controller/tests/test_aries_tenant_controller.py

@@ -0,0 +1,69 @@
+import logging
+import re
+import pytest
+import pytest_asyncio
+from aiohttp import (
+    web,
+    ClientSession,
+)
+
+from ..aries_webhook_server import AriesWebhookServer
+
+LOGGER = logging.getLogger(__name__)
+
+
+class TestAriesWebhookServer():
+
+    webhook_host = ""
+    webhook_port = 8000
+    webhook_base = ""
+
+    @pytest.mark.asyncio
+    async def test_init_args_missing_webhook_host(self):
+        with pytest.raises(
+                TypeError, 
+                match=re.escape(
+                    "__init__() missing 1 required positional argument: 'webhook_host'"
+                )):
+            AriesWebhookServer(
+                webhook_port=self.webhook_port,
+                webhook_base=self.webhook_base)
+
+    @pytest.mark.asyncio
+    async def test_init_args_missing_webhook_port(self):
+        with pytest.raises(
+                TypeError, 
+                match=re.escape(
+                    "__init__() missing 1 required positional argument: 'webhook_port'"
+                )):
+            AriesWebhookServer(
+                webhook_host=self.webhook_host,
+                webhook_base=self.webhook_base)
+
+    @pytest.mark.asyncio
+    async def test_listen_webhooks(self, caplog):
+        caplog.set_level(logging.INFO)
+        aws = AriesWebhookServer(
+                webhook_host=self.webhook_host,
+                webhook_port=self.webhook_port)
+        await aws.listen_webhooks()
+        assert f"Listening Webhooks on {aws.webhook_host}:{aws.webhook_port}" in caplog.text
+        await aws.terminate()
+
+    # TODO create mocks for pubsub webhook handling
+    # Not quite sure how to do this best
+    
+    @pytest.mark.asyncio
+    async def test_terminate(self, caplog):
+        caplog.set_level(logging.INFO)
+        aws = AriesWebhookServer(
+                webhook_host=self.webhook_host,
+                webhook_port=self.webhook_port)
+        assert await aws.terminate() is None
+
+        aws = AriesWebhookServer(
+                webhook_host=self.webhook_host,
+                webhook_port=self.webhook_port)
+        await aws.listen_webhooks()
+        await aws.terminate()
+        assert "Webhook server terminated." in caplog.text