addressed comments

Author: jrobertboos

tests/e2e/features/environment.py

@@ -552,7 +552,9 @@ def after_feature(context: Context, feature: Feature) -> None:
         restart_container("lightspeed-stack")
         remove_config_backup(context.default_config_backup)
 
-    # Restore Lightspeed Stack config if the generic configure_service step switched it
+    # Restore Lightspeed Stack config if the generic configure_service step switched it.
+    # This cleanup intentionally runs for any feature (not tag-gated) - any feature that
+    # leaves a backup file will trigger config restoration and container restarts.
     backup_path = "lightspeed-stack.yaml.backup"
     if os.path.exists(backup_path):
         switch_config(backup_path)

tests/e2e/features/steps/proxy.py

@@ -137,22 +137,9 @@ def restore_if_modified(context: Context) -> None:
     _stop_proxy(context, "tunnel_proxy", "proxy_loop")
     _stop_proxy(context, "interception_proxy", "interception_proxy_loop")
 
-    # Check for backups from both proxy and TLS scenarios
-    _LLAMA_STACK_TLS_BACKUP = "run.yaml.tls-backup"
-    backup_to_restore = None
     if os.path.exists(_LLAMA_STACK_CONFIG_BACKUP):
-        backup_to_restore = _LLAMA_STACK_CONFIG_BACKUP
-    elif os.path.exists(_LLAMA_STACK_TLS_BACKUP):
-        backup_to_restore = _LLAMA_STACK_TLS_BACKUP
-
-    if backup_to_restore:
-        print(f"Restoring original Llama Stack config from {backup_to_restore}...")
-        shutil.copy(backup_to_restore, _LLAMA_STACK_CONFIG)
-        os.remove(backup_to_restore)
-        # Clean up the other backup too if it exists
-        for other_backup in [_LLAMA_STACK_CONFIG_BACKUP, _LLAMA_STACK_TLS_BACKUP]:
-            if other_backup != backup_to_restore and os.path.exists(other_backup):
-                os.remove(other_backup)
+        print(f"Restoring original Llama Stack config from {_LLAMA_STACK_CONFIG_BACKUP}...")
+        shutil.move(_LLAMA_STACK_CONFIG_BACKUP, _LLAMA_STACK_CONFIG)
         restart_container("llama-stack")
         restart_container("lightspeed-stack")