fixed library mode tests error

Author: jrobertboos

tests/e2e/features/environment.py

@@ -224,29 +224,22 @@ def before_scenario(context: Context, scenario: Scenario) -> None:
         switch_config(context.scenario_config)
         restart_container("lightspeed-stack")
 
+    config_name: str | None = None
     if "MCPFileAuthConfig" in scenario.effective_tags:
-        context.scenario_config = _get_config_path("mcp-file-auth", mode_dir)
-        unregister_mcp_toolgroups()
-        switch_config(context.scenario_config)
-        restart_container("lightspeed-stack")
-    if "InvalidMCPFileAuthConfig" in scenario.effective_tags:
-        context.scenario_config = _get_config_path("invalid-mcp-file-auth", mode_dir)
-        unregister_mcp_toolgroups()
-        switch_config(context.scenario_config)
-        restart_container("lightspeed-stack")
-    if "MCPKubernetesAuthConfig" in scenario.effective_tags:
-        context.scenario_config = _get_config_path("mcp-kubernetes-auth", mode_dir)
-        unregister_mcp_toolgroups()
-        switch_config(context.scenario_config)
-        restart_container("lightspeed-stack")
-    if "MCPClientAuthConfig" in scenario.effective_tags:
-        context.scenario_config = _get_config_path("mcp-client-auth", mode_dir)
-        unregister_mcp_toolgroups()
-        switch_config(context.scenario_config)
-        restart_container("lightspeed-stack")
-    if "MCPOAuthAuthConfig" in scenario.effective_tags:
-        context.scenario_config = _get_config_path("mcp-oauth-auth", mode_dir)
-        unregister_mcp_toolgroups()
+        config_name = "mcp-file-auth"
+    elif "InvalidMCPFileAuthConfig" in scenario.effective_tags:
+        config_name = "invalid-mcp-file-auth"
+    elif "MCPKubernetesAuthConfig" in scenario.effective_tags:
+        config_name = "mcp-kubernetes-auth"
+    elif "MCPClientAuthConfig" in scenario.effective_tags:
+        config_name = "mcp-client-auth"
+    elif "MCPOAuthAuthConfig" in scenario.effective_tags:
+        config_name = "mcp-oauth-auth"
+        
+    if config_name is not None:
+        if not context.is_library_mode:
+            unregister_mcp_toolgroups()
+        context.scenario_config = _get_config_path(config_name, mode_dir)
         switch_config(context.scenario_config)
         restart_container("lightspeed-stack")
 

tests/e2e/utils/llama_stack_tools.py

@@ -1,9 +1,13 @@
-"""E2E helpers to unregister and re-register Llama Stack shields via the client API.
+"""E2E test utilities for managing Llama Stack MCP toolgroups.
 
-Used by the @disable-shields tag: before the scenario we call client.shields.delete()
-to unregister the shield; after the scenario we call client.shields.register()
-to restore it. Only applies in server mode (Llama Stack as a separate service).
-Requires E2E_LLAMA_STACK_URL or E2E_LLAMA_HOSTNAME/E2E_LLAMA_PORT.
+This module provides functions to unregister (delete) MCP-related toolgroups from
+a running Llama Stack instance during end-to-end tests. These utilities are intended to
+reset Llama Stack toolgroup state between scenarios that involve dynamic toolgroup registration,
+such as when switching configurations or testing various MCP authentication methods.
+
+Only applies when running Llama Stack as a separate service (server mode).
+Requires E2E_LLAMA_STACK_URL or the combination of E2E_LLAMA_HOSTNAME and E2E_LLAMA_PORT
+environment variables to locate the Llama Stack instance.
 """
 
 import asyncio