From 2c0d6a4ce48d04fdfa41cfd1c36dc3b44c02c2e8 Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin.bharambe@gmail.com>
Date: Wed, 6 Aug 2025 11:00:06 -0700
Subject: [PATCH] simpler

---
 tests/integration/conftest.py                 | 26 +++++++------------
 .../providers/utils/sqlstore/conftest.py      |  9 -------
 2 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 tests/integration/providers/utils/sqlstore/conftest.py

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 031acdeaf..592cebd89 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -36,25 +36,17 @@ def pytest_sessionstart(session):
 
     # pull client instantiation to session start so all the complex logs during initialization
     # don't clobber the test one-liner outputs
+    print("instantiating llama_stack_client")
+    start_time = time.time()
+    with warnings.catch_warnings():
+        warnings.filterwarnings("ignore", category=DeprecationWarning)
 
-    should_skip = (
-        hasattr(session.config, "skip_llama_stack_client_instantiation")
-        and session.config.skip_llama_stack_client_instantiation
-    )
-    print(f"config: {session.config}")
-    print(
-        "hasattr(session.config, 'skip_llama_stack_client_instantiation'):",
-        hasattr(session.config, "skip_llama_stack_client_instantiation"),
-    )
-    print(f"should_skip: {should_skip}")
-    if not should_skip:
-        print("instantiating llama_stack_client")
-        start_time = time.time()
-        with warnings.catch_warnings():
-            warnings.filterwarnings("ignore", category=DeprecationWarning)
-
+        try:
             session._llama_stack_client = instantiate_llama_stack_client(session)
-        print(f"llama_stack_client instantiated in {time.time() - start_time:.3f}s")
+        except Exception as e:
+            logger.error(f"Error instantiating llama_stack_client: {e}")
+            session._llama_stack_client = None
+    print(f"llama_stack_client instantiated in {time.time() - start_time:.3f}s")
 
 
 def pytest_runtest_teardown(item):
diff --git a/tests/integration/providers/utils/sqlstore/conftest.py b/tests/integration/providers/utils/sqlstore/conftest.py
deleted file mode 100644
index e3a521f92..000000000
--- a/tests/integration/providers/utils/sqlstore/conftest.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-# All rights reserved.
-#
-# This source code is licensed under the terms described in the LICENSE file in
-# the root directory of this source tree.
-
-
-def pytest_configure(config):
-    config.skip_llama_stack_client_instantiation = True