Merge pull request #227 from davidhozic/develop

Automatic testing

Author: davidhozic

.github/workflows/python-tests.yml

@@ -0,0 +1,36 @@
+name: Run auto tests
+
+on:
+  push:
+    branches: [ "master"]
+  pull_request:
+    branches: [ "master" , "develop"]
+  workflow_dispatch:
+
+jobs:
+  pytest:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        sudo apt install -y ffmpeg
+        python -m pip install --upgrade pip
+        python -m pip install .[all]
+        python -m pip install .[testing]
+    - name: Test with pytest
+      env:
+        DISCORD_TOKEN: ${{secrets.DATT}}
+      run: |
+        pytest -v

.gitignore

@@ -1,5 +1,5 @@
 **/__pycache__/**
 settings.json
 dist/**
-test**
-build**
+build**
+**.egg-info

optional.json

@@ -2,5 +2,6 @@
     "voice" : ["PyNaCl", "yt-dlp"],
     "proxy" : ["aiohttp_socks"],
     "sql"   : ["sqlalchemy[asyncio]", "aiosqlite", "pymssql", "asyncpg", "asyncmy"],
+    "testing" : ["pytest", "pytest-xdist", "pytest-asyncio"],
     "docs"  : ["sphinx", "sphinx-autobuild", "sphinx-copybutton", "furo", "enum-tools[sphinx]", "sphinx-design[furo]", "readthedocs-sphinx-search"]
 }

setup.py

@@ -16,12 +16,13 @@
 optional_install = None
 with open("./optional.json", "r", encoding="utf-8") as rf:
     optional_install: dict = json.load(rf)
+    all_ = optional_install.copy()
+    all_.pop("testing")
+    all_.pop("docs")
+    
     # Make a key that will install all requirements
     all_deps = []
-    for key, deps in optional_install.items():
-        if key == "docs":
-            continue
-        
+    for key, deps in all_.items():       
         all_deps.extend(deps)
 
     optional_install["all"] = all_deps

src/daf/message/text_based.py

@@ -2,7 +2,6 @@
 Contains definitions for message classes that are text based."""
 
 
-from pickle import GLOBAL
 from typing import Any, Dict, List, Iterable, Optional, Union, Literal
 from datetime import datetime, timedelta
 from typeguard import typechecked
@@ -363,11 +362,10 @@ async def _send_channel(self,
                 if (self.mode in {"send" , "clear-send"} or # Mode dictates to send new message or delete previous and then send new message or mode dictates edit but message was  never sent to this channel before
                     self.mode == "edit" and self.sent_messages.get(channel.id, None) is None
                 ):
-                    discord_sent_msg = await channel.send(  text,
+                    self.sent_messages[channel.id] = await channel.send(  text,
                                                             embed=embed,
                                                             # Create discord.File objects here so it is catched by the except block and then logged
                                                             files=[discord.File(fwFILE.filename) for fwFILE in files])
-                    self.sent_messages[channel.id] = discord_sent_msg
                 # Mode is edit and message was already send to this channel
                 elif self.mode == "edit":
                     await self.sent_messages[channel.id].edit ( text,

testing/conftest.py

@@ -0,0 +1,5 @@
+import pytest
+
+pytest_plugins = [
+    "fixtures.main",
+]

testing/direct_main_send_multiple.py

@@ -0,0 +1,61 @@
+import asyncio
+import pytest
+import pytest_asyncio
+import os
+import daf
+
+
+TEST_TOKEN = os.environ.get("DISCORD_TOKEN")
+TEST_GUILD_ID = 863071397207212052
+TEST_CATEGORY_NAME = "RUNNING-TEST"
+TEST_TEXT_CHANNEL_NAME_FORM = "PYTEST"
+TEST_TEXT_CHANNEL_NUM = 3
+TEST_VOICE_CHANNEL_NAME_FORM = "PYTEST_VOICE"
+TEST_VOICE_CHANNEL_NUM = 2
+
+
+@pytest.fixture(scope="session")
+def event_loop():
+    try:
+        loop = asyncio.get_running_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+    yield loop
+    loop.close()
+
+
+@pytest.fixture(scope="session", autouse=True)
+def start_daf(event_loop: asyncio.AbstractEventLoop):
+    event_loop.run_until_complete(daf.initialize(TEST_TOKEN))
+    return event_loop
+
+
+@pytest_asyncio.fixture(scope="session")
+async def category():
+    client = daf.get_client()
+    guild: daf.discord.Guild = client.get_guild(TEST_GUILD_ID)
+    cat = await guild.create_category(TEST_CATEGORY_NAME)
+    yield cat
+    await cat.delete()
+
+
+@pytest_asyncio.fixture(scope="session")
+async def text_channels(category: daf.discord.CategoryChannel):
+    ret = []
+    for i in range(TEST_TEXT_CHANNEL_NUM):
+        ret.append(await category.create_text_channel(TEST_TEXT_CHANNEL_NAME_FORM))
+
+    yield ret
+    for c in ret:
+        await c.delete()
+
+
+@pytest_asyncio.fixture(scope="session")
+async def voice_channels(category: daf.discord.CategoryChannel):
+    ret = []
+    for i in range(TEST_VOICE_CHANNEL_NUM):
+        ret.append(await category.create_voice_channel(TEST_VOICE_CHANNEL_NAME_FORM))
+    
+    yield ret
+    for c in ret:
+        await c.delete()