From 3d9ec01950bf25580ba1f4b57db8fd2b9196fd59 Mon Sep 17 00:00:00 2001 From: hay-kot Date: Fri, 30 Apr 2021 08:49:38 -0800 Subject: [PATCH] fix tests --- mealie/db/init_db.py | 2 +- tests/unit_tests/test_config.py | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/mealie/db/init_db.py b/mealie/db/init_db.py index 0fb68948b..f5cfa746f 100644 --- a/mealie/db/init_db.py +++ b/mealie/db/init_db.py @@ -2,7 +2,7 @@ from mealie.core import root_logger from mealie.core.config import settings from mealie.core.security import get_password_hash from mealie.db.database import db -from mealie.db.db_setup import create_session, sqlite_exists +from mealie.db.db_setup import create_session from mealie.schema.settings import SiteSettings from mealie.schema.theme import SiteTheme from sqlalchemy.orm import Session diff --git a/tests/unit_tests/test_config.py b/tests/unit_tests/test_config.py index 8dd0fd612..ba1a85c2a 100644 --- a/tests/unit_tests/test_config.py +++ b/tests/unit_tests/test_config.py @@ -1,13 +1,14 @@ from pathlib import Path -from mealie.core.config import CWD, DATA_DIR, AppDirectories, AppSettings, determine_data_dir, determine_secrets +from mealie.core.config import (CWD, DATA_DIR, AppDirectories, AppSettings, + determine_data_dir, determine_secrets) def test_default_settings(monkeypatch): monkeypatch.delenv("DEFAULT_GROUP", raising=False) monkeypatch.delenv("DEFAULT_PASSWORD", raising=False) - monkeypatch.delenv("DB_USERNAME", raising=False) - monkeypatch.delenv("DB_PASSWORD", raising=False) + monkeypatch.delenv("POSTGRES_USER", raising=False) + monkeypatch.delenv("POSTGRES_PASSWORD", raising=False) monkeypatch.delenv("DEFAULT_PASSWORD", raising=False) monkeypatch.delenv("API_PORT", raising=False) monkeypatch.delenv("API_DOCS", raising=False) @@ -17,8 +18,8 @@ def test_default_settings(monkeypatch): assert app_settings.DEFAULT_GROUP == "Home" assert app_settings.DEFAULT_PASSWORD == "MyPassword" - assert app_settings.DB_USERNAME == "mealie" - assert app_settings.DB_PASSWORD == "mealie" + assert app_settings.POSTGRES_USER == "mealie" + assert app_settings.POSTGRES_PASSWORD == "mealie" assert app_settings.API_PORT == 9000 assert app_settings.API_DOCS is True assert app_settings.IS_DEMO is False @@ -30,8 +31,8 @@ def test_default_settings(monkeypatch): def test_non_default_settings(monkeypatch): monkeypatch.setenv("DEFAULT_GROUP", "Test Group") monkeypatch.setenv("DEFAULT_PASSWORD", "Test Password") - monkeypatch.setenv("DB_USERNAME", "mealie-test") - monkeypatch.setenv("DB_PASSWORD", "mealie-test") + monkeypatch.setenv("POSTGRES_USER", "mealie-test") + monkeypatch.setenv("POSTGRES_PASSWORD", "mealie-test") monkeypatch.setenv("API_PORT", "8000") monkeypatch.setenv("API_DOCS", "False") @@ -39,8 +40,8 @@ def test_non_default_settings(monkeypatch): assert app_settings.DEFAULT_GROUP == "Test Group" assert app_settings.DEFAULT_PASSWORD == "Test Password" - assert app_settings.DB_USERNAME == "mealie-test" - assert app_settings.DB_PASSWORD == "mealie-test" + assert app_settings.POSTGRES_USER == "mealie-test" + assert app_settings.POSTGRES_PASSWORD == "mealie-test" assert app_settings.API_PORT == 8000 assert app_settings.API_DOCS is False