Pytest: junit_family deprecation warning

Author: ovv

pyslackersweb/sirbot/__init__.py

@@ -1,7 +1,13 @@
+import logging
+
 from aiohttp import web
 
 from pyslackersweb.sirbot.views import readthedocs, slack
 
+from . import settings
+
+logger = logging.getLogger(__name__)
+
 
 async def app_factory() -> web.Application:
     sirbot = web.Application()
@@ -11,6 +17,9 @@ async def app_factory() -> web.Application:
         scheduler=None,  # populated via parent app signal
     )
 
+    if not settings.SLACK_SIGNING_SECRET:
+        logger.error("Environment variable 'SLACK_SIGNING_SECRET' not set")
+
     readthedocs.add_routes(sirbot.router)
     slack.add_routes(sirbot.router)
     return sirbot

pyslackersweb/sirbot/settings.py

@@ -1,14 +1,11 @@
 import os
-import logging
 
 IS_PRODUCTION = os.environ.get("PLATFORM_BRANCH") == "master"
 
 # production settings
 READTHEDOCS_NOTIFICATION_CHANNEL = "community_projects"
 SLACK_TEAM_ID = os.environ.get("SLACK_TEAM_ID")
 SLACK_SIGNING_SECRET = os.environ.get("SLACK_SIGNING_SECRET", "")
-if not SLACK_SIGNING_SECRET:
-    logging.error("Environment variable 'SLACK_SIGNING_SECRET' not set")
 
 # Development settings
 if not IS_PRODUCTION:

pyslackersweb/sirbot/views/slack/commands.py renamed to pyslackersweb/sirbot/slack/commands.py

@@ -4,8 +4,7 @@
 from slack.sansio import validate_request_signature
 
 from pyslackersweb.sirbot import settings
-
-from . import commands
+from pyslackersweb.sirbot.slack import commands
 
 
 def add_routes(router: web.UrlDispatcher) -> None:

pyslackersweb/sirbot/views/slack/__init__.py renamed to pyslackersweb/sirbot/views/slack.py

@@ -0,0 +1,3 @@
+[pytest]
+# https://docs.pytest.org/en/latest/deprecations.html#junit-family-default-value-change-to-xunit2
+junit_family=legacy

pytest.ini

@@ -1,7 +1,5 @@
 import pytest
 
-from unittest import mock
-
 import pyslackersweb
 import pyslackersweb.website.tasks
 
@@ -11,8 +9,21 @@
 pytest_plugins = ("slack.tests.plugin",)
 
 
+@pytest.fixture()
+async def slack_client_ctx(slack_client):
+    async def ctx(app):
+        pyslackersweb.contexts._register_in_app(app, "slack_client", slack_client)
+        pyslackersweb.contexts._register_in_app(app, "slack_client_legacy", slack_client)
+        yield
+
+    return ctx
+
+
 @pytest.fixture
-async def client(aiohttp_client, slack_client):
+async def client(monkeypatch, aiohttp_client, slack_client_ctx):
+
+    # Patch imported slack_client context in pyslackersweb/__init__.py with the fake slack client ctx
+    monkeypatch.setattr(pyslackersweb, "slack_client", slack_client_ctx)
 
     application = await pyslackersweb.app_factory()