22import os
33from typing import Generator
44from sqlmodel import create_engine , Session , select
5- from sqlalchemy import Engine
65from fastapi .testclient import TestClient
76from dotenv import load_dotenv
87from utils .core .db import get_connection_url , tear_down_db , set_up_db , create_default_roles , ensure_database_exists
9- from utils .core .models import User , PasswordResetToken , EmailUpdateToken , Organization , Role , Account , Invitation
8+ from utils .core .models import User , Organization , Role , Account , Invitation
109from utils .core .auth import get_password_hash , create_access_token , create_refresh_token
1110from main import app
1211from datetime import datetime , UTC , timedelta
@@ -21,17 +20,13 @@ def __init__(self, message="An error occurred during test setup"):
2120
2221@pytest .fixture
2322def env_vars (monkeypatch ):
24- # Get valid db user, password, host, and port from .env
2523 load_dotenv ()
26- os .environ ["DB_HOST" ] = os .getenv ("DB_HOST" , "localhost" )
27- os .environ ["DB_PORT" ] = os .getenv ("DB_PORT" , "5432" )
28- os .environ ["DB_USER" ] = os .getenv ("DB_USER" , "appuser" )
29- os .environ ["DB_PASSWORD" ] = os .getenv ("DB_PASSWORD" , "testpassword" )
3024
3125 # monkeypatch remaining env vars
3226 with monkeypatch .context () as m :
3327 m .setenv ("SECRET_KEY" , "testsecretkey" )
3428 m .setenv ("HOST_NAME" , "Test Organization" )
29+ # Get valid db user, password, host, and port from env
3530 m .setenv ("DB_HOST" , os .getenv ("DB_HOST" , "localhost" ))
3631 m .setenv ("DB_PORT" , os .getenv ("DB_PORT" , "5432" ))
3732 m .setenv ("DB_USER" , os .getenv ("DB_USER" , "appuser" ))
0 commit comments