Skip to content

Commit 724a229

Browse files
Akhilesh NegiAkhilesh Negi
authored andcommitted
removing redundant code
1 parent 5398d21 commit 724a229

4 files changed

Lines changed: 7 additions & 14 deletions

File tree

backend/app/tests/api/routes/documents/test_route_document_upload.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
from moto import mock_aws
99
from sqlmodel import Session, select
1010
from fastapi.testclient import TestClient
11-
from dotenv import find_dotenv
1211

1312
from app.core.cloud import AmazonCloudStorageClient
1413
from app.core.config import settings
1514
from app.models import Document
1615
from app.tests.utils.document import Route, WebCrawler, httpx_to_standard
17-
from app.tests.utils.utils import load_environment
1816

1917

2018
class WebUploader(WebCrawler):
@@ -49,10 +47,6 @@ def uploader(client: TestClient, user_api_key_header: dict[str, str]):
4947

5048
@pytest.fixture(scope="class")
5149
def aws_credentials():
52-
# Load test environment to ensure correct bucket name
53-
path = find_dotenv(".env.test")
54-
load_environment(path)
55-
5650
# Set AWS credentials for moto mock
5751
os.environ["AWS_ACCESS_KEY_ID"] = "testing"
5852
os.environ["AWS_SECRET_ACCESS_KEY"] = "testing"

backend/app/tests/conftest.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import pytest
22
import logging
3+
34
from collections.abc import Generator
45
from fastapi.testclient import TestClient
56
from sqlmodel import Session
67
from sqlalchemy import event
8+
from dotenv import find_dotenv
79

810
from app.api.deps import get_db
911
from app.main import app
@@ -23,7 +25,10 @@
2325

2426
@pytest.fixture(scope="session", autouse=True)
2527
def seed_baseline():
26-
load_environment("../.env.test")
28+
# Load test environment to ensure correct bucket name
29+
path = find_dotenv(".env.test")
30+
load_environment(path)
31+
2732
with Session(engine) as session:
2833
logger.info("Seeding baseline data...")
2934
seed_database(session) # deterministic baseline

backend/app/tests/utils/utils.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def get_project(session: Session, name: str | None = None) -> Project:
9292
return project
9393

9494

95-
def load_environment(env_test_path: str = "../.env.test"):
95+
def load_environment(env_test_path: str = "../.env.test") -> None:
9696
"""Loads the test environment variables if the .env.test file exists.
9797
9898
Raises an error if any required PostgreSQL credentials are missing or if the
@@ -128,8 +128,6 @@ def load_environment(env_test_path: str = "../.env.test"):
128128
f"{env_test_path} not found. Using default environment settings."
129129
)
130130

131-
return settings
132-
133131

134132
def get_assistant(session: Session, name: str | None = None) -> Assistant:
135133
"""

backend/app/tests_pre_start.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
from sqlmodel import Session, select
55
from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
66

7-
from app.tests.utils.utils import load_environment
8-
9-
load_environment("../.env.test")
10-
117
from app.core.db import engine
128

139
logging.basicConfig(level=logging.INFO)

0 commit comments

Comments
 (0)