Skip to content

Commit 5e1c59e

Browse files
jrobertboosjrobertboos
committed
addressed comments
1 parent 7b4f1f0 commit 5e1c59e

3 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎tests/e2e/features/environment.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import os
1111
import subprocess
1212
import time
13+
from typing import Optional
1314

1415
import requests
1516
from behave.model import Feature, Scenario
@@ -225,7 +226,7 @@ def before_scenario(context: Context, scenario: Scenario) -> None:
225226
switch_config(context.scenario_config)
226227
restart_container("lightspeed-stack")
227228

228-
config_name: str | None = None
229+
config_name: Optional[str] = None
229230
if "MCPFileAuthConfig" in scenario.effective_tags:
230231
config_name = "mcp-file-auth"
231232
elif "InvalidMCPFileAuthConfig" in scenario.effective_tags:

‎tests/e2e/features/mcp.feature‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ Feature: MCP tests
77

88

99
# File-based
10-
@skip # will be fixed by LCORE-1461
10+
@skip #TODO: LCORE-1461
1111
@MCPFileAuthConfig
1212
Scenario: Check if tools endpoint succeeds when MCP file-based auth token is passed
1313
Given The system is in default state
1414
When I access REST API endpoint "tools" using HTTP GET method
1515
Then The status code of the response is 200
1616
And The body of the response contains mcp-file
1717

18-
@skip-in-library-mode # will be fixed in LCORE-1428
18+
@skip-in-library-mode #TODO: LCORE-1428
1919
@MCPFileAuthConfig
2020
Scenario: Check if query endpoint succeeds when MCP file-based auth token is passed
2121
Given The system is in default state
@@ -30,7 +30,7 @@ Feature: MCP tests
3030
| Hello |
3131
And The token metrics should have increased
3232

33-
@skip-in-library-mode # will be fixed in LCORE-1428
33+
@skip-in-library-mode #TODO: LCORE-1428
3434
@MCPFileAuthConfig
3535
Scenario: Check if streaming_query endpoint succeeds when MCP file-based auth token is passed
3636
Given The system is in default state
@@ -46,7 +46,7 @@ Feature: MCP tests
4646
| Hello |
4747
And The token metrics should have increased
4848

49-
@skip # will be fixed by LCORE-1461
49+
@skip #TODO: LCORE-1461
5050
@InvalidMCPFileAuthConfig
5151
Scenario: Check if tools endpoint reports error when MCP file-based invalid auth token is passed
5252
Given The system is in default state
@@ -62,7 +62,7 @@ Feature: MCP tests
6262
}
6363
"""
6464

65-
@skip # will be fixed by LCORE-1463
65+
@skip #TODO: LCORE-1463
6666
@InvalidMCPFileAuthConfig
6767
Scenario: Check if query endpoint reports error when MCP file-based invalid auth token is passed
6868
Given The system is in default state
@@ -81,7 +81,7 @@ Feature: MCP tests
8181
}
8282
"""
8383

84-
@skip # will be fixed by LCORE-1463
84+
@skip #TODO: LCORE-1463
8585
@InvalidMCPFileAuthConfig
8686
Scenario: Check if streaming_query endpoint reports error when MCP file-based invalid auth token is passed
8787
Given The system is in default state
@@ -101,7 +101,7 @@ Feature: MCP tests
101101
"""
102102

103103
# Kubernetes
104-
@skip # will be fixed by LCORE-1461
104+
@skip #TODO: LCORE-1461
105105
@MCPKubernetesAuthConfig
106106
Scenario: Check if tools endpoint succeeds when MCP kubernetes auth token is passed
107107
Given The system is in default state
@@ -110,7 +110,7 @@ Feature: MCP tests
110110
Then The status code of the response is 200
111111
And The body of the response contains mcp-kubernetes
112112

113-
@skip-in-library-mode # will be fixed in LCORE-1428
113+
@skip-in-library-mode #TODO: LCORE-1428
114114
@MCPKubernetesAuthConfig
115115
Scenario: Check if query endpoint succeeds when MCP kubernetes auth token is passed
116116
Given The system is in default state
@@ -126,7 +126,7 @@ Feature: MCP tests
126126
| Hello |
127127
And The token metrics should have increased
128128

129-
@skip-in-library-mode # will be fixed in LCORE-1428
129+
@skip-in-library-mode #TODO: LCORE-1428
130130
@MCPKubernetesAuthConfig
131131
Scenario: Check if streaming_query endpoint succeeds when MCP kubernetes auth token is passed
132132
Given The system is in default state
@@ -143,7 +143,7 @@ Feature: MCP tests
143143
| Hello |
144144
And The token metrics should have increased
145145

146-
@skip # will be fixed by LCORE-1461
146+
@skip #TODO: LCORE-1461
147147
@MCPKubernetesAuthConfig
148148
Scenario: Check if tools endpoint reports error when MCP kubernetes invalid auth token is passed
149149
Given The system is in default state
@@ -160,7 +160,7 @@ Feature: MCP tests
160160
}
161161
"""
162162

163-
@skip # will be fixed by LCORE-1463
163+
@skip #TODO: LCORE-1463
164164
@MCPKubernetesAuthConfig
165165
Scenario: Check if query endpoint reports error when MCP kubernetes invalid auth token is passed
166166
Given The system is in default state
@@ -180,7 +180,7 @@ Feature: MCP tests
180180
}
181181
"""
182182

183-
@skip # will be fixed by LCORE-1463
183+
@skip #TODO: LCORE-1463
184184
@MCPKubernetesAuthConfig
185185
Scenario: Check if streaming_query endpoint reports error when MCP kubernetes invalid auth token is passed
186186
Given The system is in default state
@@ -201,7 +201,7 @@ Feature: MCP tests
201201
"""
202202

203203
# Client-provided
204-
@skip # will be fixed by LCORE-1462
204+
@skip #TODO: LCORE-1462
205205
@MCPClientAuthConfig
206206
Scenario: Check if tools endpoint succeeds by skipping when MCP client-provided auth token is omitted
207207
Given The system is in default state
@@ -251,7 +251,7 @@ Feature: MCP tests
251251
Then The status code of the response is 200
252252
And The body of the response contains mcp-client
253253

254-
@skip-in-library-mode # will be fixed in LCORE-1428
254+
@skip-in-library-mode #TODO: LCORE-1428
255255
@MCPClientAuthConfig
256256
Scenario: Check if query endpoint succeeds when MCP client-provided auth token is passed
257257
Given The system is in default state
@@ -270,7 +270,7 @@ Feature: MCP tests
270270
| Hello |
271271
And The token metrics should have increased
272272

273-
@skip-in-library-mode # will be fixed in LCORE-1428
273+
@skip-in-library-mode #TODO: LCORE-1428
274274
@MCPClientAuthConfig
275275
Scenario: Check if streaming_query endpoint succeeds when MCP client-provided auth token is passed
276276
Given The system is in default state
@@ -420,7 +420,7 @@ Feature: MCP tests
420420
Then The status code of the response is 200
421421
And The body of the response contains mcp-oauth
422422

423-
@skip-in-library-mode # will be fixed in LCORE-1428
423+
@skip-in-library-mode #TODO: LCORE-1428
424424
@MCPOAuthAuthConfig
425425
Scenario: Check if query endpoint succeeds when MCP OAuth auth token is passed
426426
Given The system is in default state
@@ -439,7 +439,7 @@ Feature: MCP tests
439439
| Hello |
440440
And The token metrics should have increased
441441

442-
@skip-in-library-mode # will be fixed in LCORE-1428
442+
@skip-in-library-mode #TODO: LCORE-1428
443443
@MCPOAuthAuthConfig
444444
Scenario: Check if streaming_query endpoint succeeds when MCP OAuth auth token is passed
445445
Given The system is in default state

‎tests/e2e/utils/utils.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,8 @@ def clear_llama_stack_storage(container_name: str = "lightspeed-stack") -> None:
272272
check=False,
273273
)
274274
except subprocess.TimeoutExpired as e:
275-
print(f"Warning: Could not clear Llama Stack storage: {e}")
275+
print(f"Failed to clear Llama Stack storage: {e}")
276+
raise
276277

277278

278279
def restart_container(container_name: str) -> None:

0 commit comments

Comments
 (0)