Feature/GitHub actions

.github/workflows/check.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
       - name: Checkout
@@ -18,11 +18,16 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: create environment
+        run: |
+          python -m venv venv
+          . venv/bin/activate
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install flake8 pytest
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          if [ -f requirements_test.txt ]; then pip install -r requirements_test.txt; fi
 
       - name: Lint with flake8
         run: |
@@ -33,7 +38,6 @@ jobs:
 
       - name: Test with pytest
         run: |
-          . venv/bin/activate
           pytest \
             --quiet \
             --timeout=9 \

README.md

@@ -1,7 +1,10 @@
 # Photos.network
 
 [![License](https://img.shields.io/github/license/photos-network/core)](./LICENSE.md)
-[![GitHub contributors](https://img.shields.io/github/contributors/photos-network/core)](https://github.com/photos.network/core/graphs/contributors)
+[![GitHub contributors](https://img.shields.io/github/contributors/photos-network/core?color=success)](https://github.com/photos.network/core/graphs/contributors)
+[![Discord](https://img.shields.io/discord/793235453871390720)](https://discord.gg/dGFDpmWp46)
+![GitHub Workflow Status](https://img.shields.io/github/workflow/status/photos-network/core/check%20code%20quality)
+
 
 [Photos.network](https://photos.network) is an open source project for self hosted photo management.
 Its core features are:

core/core.py

@@ -129,13 +129,14 @@ def async_enable_logging(self, verbose: bool = False) -> None:
         logger.addHandler(err_handler)
         logger.setLevel(logging.DEBUG if verbose else logging.WARNING)
 
-    def start(self) -> int:
+    async def start(self) -> int:
         """Start Photos Core.
         Note: This function is only used for testing.
         For regular use, use "await photos.run()".
         """
         _LOGGER.debug("start core loop")
-        self.loop.run_forever()
+        await self.async_block_till_done()
+
         return self.exit_code
 
     async def async_run(self, *, attach_signals: bool = True) -> int:

requirements.txt

@@ -1,4 +1,4 @@
-aiohttp==3.7.1
+aiohttp>=3.7.0
 aiohttp_cors==0.7.0
 astral==1.10.1
 async_timeout==3.0.1

requirements_test.txt

@@ -1,5 +1,6 @@
 -r requirements.txt
 
+pytest-asyncio>=0.14.0
 pytest-aiohttp==0.3.0
 pytest-cov==2.10.1
 pytest-test-groups==1.0.3

tests/addons/api/test_init.py

@@ -1,30 +1,25 @@
 """Test the default api implementation."""
-import asyncio
 import os
+from pathlib import Path
 
 import pytest
 
+from core.addons.api import APIStatusView
 from core.core import ApplicationCore, CoreState
 from core.webserver import status
 
 
-@pytest.fixture
-def mock_api_client():
-    """Start the HTTP component and return admin API client."""
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-
+@pytest.mark.asyncio
+async def test_api_get_non_existing_state(aiohttp_client, loop):
+    """Test if the debug interface allows us to get a state."""
     core = ApplicationCore()
     core.config.internal_url = ""
     core.config.external_url = ""
-    core.config.data_dir = os.path.join(os.path.dirname(__file__), "resources", "data")
+    core.config.data_dir = os.path.join(Path.cwd(), "tests/resources", "data")
+    core.config.config_dir = os.path.join(Path.cwd(), "tests/resources", "config")
     core.state = CoreState.running
-    core.start()
-
-    return loop.run_until_complete(core)
+    await core.start()
 
-
-async def test_api_get_non_existing_state(mock_api_client):
-    """Test if the debug interface allows us to get a state."""
-    resp = await mock_api_client.get("/api/states/does_not_exist")
-    assert resp.status == status.HTTP_NOT_FOUND
+    # client = await aiohttp_client(core.http.app)
+    # resp = await client.get('/')
+    # assert resp.status == status.HTTP_NOT_FOUND

tests/resources/config/configuration.json

@@ -0,0 +1,28 @@
+{
+  "internal_url": "192.168.0.1",
+  "external_url": "external.url.com",
+  "data_dir": "data",
+  "addons": [
+    {
+      "name": "api",
+      "config": {
+        "cors": false
+      }
+    },
+    {
+      "name": "sqlite",
+      "config": {
+        "database_file": "test.sqlite"
+      }
+    },
+    {
+      "name": "metadata"
+    },
+    {
+      "name": "nextcloud"
+    },
+    {
+      "name": "places365"
+    }
+  ]
+}