move

onyx-dot-app · Feb 16, 2025 · ee27da0 · ee27da0
1 parent 218b8de
commit ee27da0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/backend/tests/integration/common_utils/reset.py b/backend/tests/integration/common_utils/reset.py
@@ -29,7 +29,6 @@
 from onyx.setup import setup_postgres
 from onyx.setup import setup_vespa
 from onyx.utils.logger import setup_logger
-from tests.integration.common_utils.constants import GUARANTEED_FRESH_SETUP
 
 logger = setup_logger()
 
@@ -376,9 +375,6 @@ def reset_all(
 
 
 def _do_reset(database: str, postgres_host: str, postgres_port: str) -> None:
-    if GUARANTEED_FRESH_SETUP:
-        return None
-
     logger.info("Resetting Postgres...")
     reset_postgres(
         database=database,

diff --git a/backend/tests/integration/conftest.py b/backend/tests/integration/conftest.py
@@ -8,6 +8,7 @@
 from onyx.db.engine import get_session_context_manager
 from onyx.db.search_settings import get_current_search_settings
 from tests.integration.common_utils.constants import GENERAL_HEADERS
+from tests.integration.common_utils.constants import GUARANTEED_FRESH_SETUP
 from tests.integration.common_utils.managers.user import build_email
 from tests.integration.common_utils.managers.user import DEFAULT_PASSWORD
 from tests.integration.common_utils.managers.user import UserManager
@@ -50,6 +51,10 @@ def vespa_client(db_session: Session) -> vespa_fixture:
 
 @pytest.fixture
 def reset() -> None:
+    if GUARANTEED_FRESH_SETUP:
+        print("GUARANTEED_FRESH_SETUP is true, skipping reset")
+        return None
+
     reset_all()