♻️ Refactor code structure for tests (#674)

UCLOrengoGroup · Mar 11, 2024 · ed9958b · ed9958b
1 parent 20f6020
commit ed9958b
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 2 deletions.
diff --git a/backend/app/api/routes/login.py b/backend/app/api/routes/login.py
@@ -10,7 +10,7 @@
 from app.core import security
 from app.core.config import settings
 from app.core.security import get_password_hash
-from app.models import Message, NewPassword, Token, User, UserOut
+from app.models import Message, NewPassword, Token, UserOut
 from app.utils import (
     generate_password_reset_token,
     generate_reset_password_email,

diff --git a/backend/app/tests/api/api_v1/__init__.py → backend/app/tests/api/routes/__init__.py b/backend/app/tests/api/api_v1/__init__.py → backend/app/tests/api/routes/__init__.py
diff --git a/backend/app/tests/api/api_v1/test_celery.py → backend/app/tests/api/routes/test_celery.py b/backend/app/tests/api/api_v1/test_celery.py → backend/app/tests/api/routes/test_celery.py
diff --git a/backend/app/tests/api/api_v1/test_items.py → backend/app/tests/api/routes/test_items.py b/backend/app/tests/api/api_v1/test_items.py → backend/app/tests/api/routes/test_items.py
diff --git a/backend/app/tests/api/api_v1/test_login.py → backend/app/tests/api/routes/test_login.py b/backend/app/tests/api/api_v1/test_login.py → backend/app/tests/api/routes/test_login.py
diff --git a/backend/app/tests/api/api_v1/test_users.py → backend/app/tests/api/routes/test_users.py b/backend/app/tests/api/api_v1/test_users.py → backend/app/tests/api/routes/test_users.py
diff --git a/backend/scripts/lint.sh b/backend/scripts/lint.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+set -e
 set -x
 
 mypy app

diff --git a/backend/tests-start.sh b/backend/tests-start.sh
@@ -1,7 +1,8 @@
 #! /usr/bin/env bash
 set -e
+set -x
 
 python /app/app/tests_pre_start.py
 
-bash ./scripts/lint.sh 
+bash ./scripts/lint.sh
 bash ./scripts/test.sh "$@"
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -2,6 +2,7 @@
 
 # Exit in case of error
 set -e
+set -x
 
 docker compose build
 docker compose down -v --remove-orphans # Remove possibly previous broken stacks left hanging after an error
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     # Exit in case of error
     set -e
+    set -x
     docker compose build
     docker compose down -v --remove-orphans # Remove possibly previous broken stacks left hanging after an error
@@ Expand Down @@