Fixes in Makefile and Workflows (#174)

Author: dyakovri

.github/workflows/tests.yml .github/workflows/checks.yml.github/workflows/tests.yml renamed to .github/workflows/checks.yml

@@ -1,25 +1,29 @@
-name: Python package
+name: Python tests
 
 on:
   pull_request:
 
-
 jobs:
   test:
     name: Unit tests
     runs-on: ubuntu-latest
-    continue-on-error: true
+    services:
+      postgres:
+        image: postgres:15
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+          -p 5432:5432
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up docker
-        uses: docker-practice/actions-setup-docker@master
-      - name: Run postgres
-        run: |
-          docker run -d -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name db-test postgres:15-alpine
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: "3.11"
       - name: Install dependencies
         run: |
           python -m ensurepip
@@ -29,14 +33,17 @@ jobs:
         run: |
           DB_DSN=postgresql://postgres@localhost:5432/postgres alembic upgrade head
       - name: Build coverage file
+        id: pytest
         run: |
           DB_DSN=postgresql://postgres@localhost:5432/postgres pytest --junitxml=pytest.xml --cov-report=term-missing:skip-covered --cov=auth_backend tests/ | tee pytest-coverage.txt
+          exit ${PIPESTATUS[0]}
       - name: Print report
         if: always()
         run: |
           cat pytest-coverage.txt
       - name: Pytest coverage comment
         uses: MishaKav/pytest-coverage-comment@main
+        if: always()
         with:
           pytest-coverage-path: ./pytest-coverage.txt
           title: Coverage Report
@@ -49,6 +56,10 @@ jobs:
           remove-link-from-badge: false
           junitxml-path: ./pytest.xml
           junitxml-title: Summary
+      - name: Fail on pytest errors
+        if: steps.pytest.outcome == 'failure'
+        run: exit 1
+
   linting:
     runs-on: ubuntu-latest
     steps:
@@ -61,7 +72,7 @@ jobs:
           requirementsFiles: "requirements.txt requirements.dev.txt"
       - uses: psf/black@stable
       - name: Comment if linting failed
-        if: ${{ failure() }}
+        if: failure()
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |

migrations/versions/6c27352ee53b_unique_scopes.py

@@ -4,7 +4,6 @@
 Create Date: 2023-03-12 23:39:28.891033
 """
 
-import sqlalchemy as sa
 from alembic import op
 
 

migrations/versions/c03c6b509881_rollback_unique_scopes.py

@@ -6,7 +6,6 @@
 
 """
 
-import sqlalchemy as sa
 from alembic import op
 
 

migrations/versions/dcb89e72d446_session_security_scopes.py

@@ -6,20 +6,10 @@
 
 """
 
-import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.orm import Session
 
-from auth_backend.models.db import (
-    DynamicOption,
-    Group,
-    GroupScope,
-    Scope,
-    User,
-    UserGroup,
-    UserSession,
-    UserSessionScope,
-)
+from auth_backend.models.db import DynamicOption, Group, Scope, User, UserSession
 
 
 # revision identifiers, used by Alembic.

tests/conftest.py

@@ -1,19 +1,19 @@
 import datetime
 import errno
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 from fastapi.testclient import TestClient
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from starlette import status
 
-from auth_backend.auth_plugins import Email, YandexAuth
+from auth_backend.auth_plugins import YandexAuth
 from auth_backend.auth_plugins.auth_method import random_string
 from auth_backend.models import AuthMethod, User
 from auth_backend.models.db import AuthMethod, Group, GroupScope, Scope, User, UserGroup, UserSession, UserSessionScope
 from auth_backend.routes.base import app
-from auth_backend.settings import Settings, get_settings
+from auth_backend.settings import get_settings
 
 
 @pytest.fixture

tests/test_routes/test_change_password.py

@@ -1,4 +1,3 @@
-import pytest
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session
 from starlette import status

tests/test_routes/test_delete_last_auth_method.py

@@ -1,18 +1,8 @@
-import asyncio
-import errno
-import random
-import string
-
 import pytest
-import pytest_asyncio
-from sqlalchemy import create_engine
-from sqlalchemy.orm import Session, sessionmaker
 
-from auth_backend.auth_plugins import Email, YandexAuth
-from auth_backend.auth_plugins.auth_method import random_string
+from auth_backend.auth_plugins import YandexAuth
 from auth_backend.exceptions import LastAuthMethodDelete
-from auth_backend.models import AuthMethod, User
-from auth_backend.settings import Settings, get_settings
+from auth_backend.settings import get_settings
 
 
 pytest_plugins = ('pytest_asyncio',)

tests/test_routes/test_email_message_delay.py

@@ -1,10 +1,8 @@
-import pytest
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session
 from starlette import status
 
-from auth_backend.models.db import UserMessageDelay
-from auth_backend.settings import Settings, get_settings
+from auth_backend.settings import get_settings
 
 
 settings = get_settings()

tests/test_routes/test_group_scopes.py

@@ -1,9 +1,6 @@
 import datetime
 
-import pytest
-
-from auth_backend.auth_plugins.auth_method import random_string
-from auth_backend.models.db import AuthMethod, Group, GroupScope, Scope, User, UserGroup, UserSession, UserSessionScope
+from auth_backend.models.db import Group, GroupScope, Scope, UserGroup
 
 
 def test_scopes_groups(client_auth, dbsession, user_scopes):

tests/test_routes/test_groups.py

@@ -1,11 +1,9 @@
 import datetime
-from time import sleep
 
-import httpx
 import pytest
 
 from auth_backend.exceptions import ObjectNotFound
-from auth_backend.models.db import Group, GroupScope, Scope, User, UserGroup
+from auth_backend.models.db import Group, UserGroup
 
 
 def test_create(client, dbsession):