diff --git a/.env-test b/.test.env similarity index 100% rename from .env-test rename to .test.env diff --git a/pytest.ini b/pytest.ini index 5f63e4b..c630e35 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,6 +1,5 @@ [pytest] # env_override_existing_values = 1 +pythonpath = . src env_files = - .env-test - -pythonpath = . src/candies \ No newline at end of file + .test.env \ No newline at end of file diff --git a/src/config.py b/src/config.py index f746c31..a5658b6 100644 --- a/src/config.py +++ b/src/config.py @@ -1,5 +1,4 @@ from pydantic import BaseSettings -import os class Settings(BaseSettings): @@ -16,7 +15,28 @@ def DB_URL(self): return f"postgresql+psycopg2://{self.DB_USER}:{self.DB_PASS}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}" class Config: - env_file = ".env" if os.environ.get("MODE") != "TEST" else ".env-test" + env_file = ".env" settings = Settings() + + +# from dotenv import dotenv_values + +# config = dotenv_values(".env") + +# DB_HOST=config.get("DB_HOST") +# DB_PORT=config.get("DB_PORT") +# DB_USER=config.get("DB_USER") +# DB_PASS=config.get("DB_PASS") +# DB_NAME=config.get("DB_NAME") +# DB_URL=f"postgresql+psycopg2://{DB_USER}:{DB_PASS}@{DB_HOST}:{DB_PORT}/{DB_NAME}" + + +# class settings: +# DB_HOST=DB_HOST +# DB_PORT=DB_PORT +# DB_USER=DB_USER +# DB_PASS=DB_PASS +# DB_NAME=DB_NAME +# DB_URL=DB_URL \ No newline at end of file diff --git a/src/conftest.py b/src/conftest.py deleted file mode 100644 index 938fcf6..0000000 --- a/src/conftest.py +++ /dev/null @@ -1,4 +0,0 @@ -import os - - -os.environ["MODE"] = "TEST" diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/conftest.py b/tests/conftest1.py similarity index 100% rename from tests/conftest.py rename to tests/conftest1.py diff --git a/tests/test_list_1.py b/tests/test_list_1.py index 5c9d690..3997b5c 100644 --- a/tests/test_list_1.py +++ b/tests/test_list_1.py @@ -5,9 +5,13 @@ from src.db import Base, engine from src.candies.models import Candies +from src.config import settings + @pytest.fixture(scope="session", autouse=True) def setup_db(): + print(f"{settings.DB_NAME=}") + assert settings.MODE == "TEST" Base.metadata.drop_all(engine) Base.metadata.create_all(engine)