Skip to content

Commit 61185a0

Browse files
authored
Stop returning null from CommandTestBase on exception (#950)
* Stop returning null for McpExceptions in CallToolAsync * Fix lustre local live failues
1 parent 90bd141 commit 61185a0

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

core/Azure.Mcp.Core/tests/Azure.Mcp.Tests/Client/CommandTestsBase.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,6 @@ protected virtual async ValueTask InitializeAsyncInternal(TestProxyFixture? prox
142142
{
143143
// MCP client throws exceptions for error responses, but we want to handle them gracefully
144144
writeOutput($"MCP exception: {ex.Message}");
145-
146-
// For validation errors, we'll return a synthetic error response
147-
if (ex.Message.Contains("An error occurred"))
148-
{
149-
// Return null to indicate error response (no results)
150-
writeOutput("synthetic error response: null (error response)");
151-
return null;
152-
}
153-
154145
throw; // Re-throw if we can't handle it
155146
}
156147

eng/scripts/Deploy-TestResources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ if ($jobInputs.Count -eq 1 -or !$Parallel) {
143143
} else {
144144
Write-Host "Deploying resources in parallel for $($jobInputs.Count) paths..." -ForegroundColor Yellow
145145
Write-Host "Cancelling this script (Ctrl-C) will not stop its background jobs. To stop the jobs, you must run:" -ForegroundColor Yellow
146-
Write-Host " Get-Job | Stop-Job -PassThrough | Remove-Job`n" -ForegroundColor Yellow
146+
Write-Host " Get-Job | Stop-Job -PassThru | Remove-Job`n" -ForegroundColor Yellow
147147

148148
Start-Sleep -Seconds 2
149149

tools/Azure.Mcp.Tools.ManagedLustre/tests/Azure.Mcp.Tools.ManagedLustre.LiveTests/ManagedLustreCommandTests.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,18 @@ public async Task Should_get_sku_info_no_zonal_support()
115115
public async Task Should_create_azure_managed_lustre_no_blob_no_cmk()
116116
{
117117
var fsName = $"amlfs-{Guid.NewGuid().ToString("N")[..8]}";
118-
var subnetId = Environment.GetEnvironmentVariable("AMLFS_SUBNET_ID");
119-
var location = Environment.GetEnvironmentVariable("LOCATION");
118+
var subnetId = Settings.DeploymentOutputs["AMLFS_SUBNET_ID"];
119+
var location = Settings.DeploymentOutputs["LOCATION"];
120120

121121
// Calculate CMK required variables
122122

123-
var keyUri = Environment.GetEnvironmentVariable("KEY_URI_WITH_VERSION");
124-
var keyVaultResourceId = Environment.GetEnvironmentVariable("KEY_VAULT_RESOURCE_ID");
125-
var userAssignedIdentityId = Environment.GetEnvironmentVariable("USER_ASSIGNED_IDENTITY_RESOURCE_ID");
123+
var keyUri = Settings.DeploymentOutputs["KEY_URI_WITH_VERSION"];
124+
var keyVaultResourceId = Settings.DeploymentOutputs["KEY_VAULT_RESOURCE_ID"];
125+
var userAssignedIdentityId = Settings.DeploymentOutputs["USER_ASSIGNED_IDENTITY_RESOURCE_ID"];
126126

127127
// Calculate HSM required variables
128-
var hsmDataContainerId = Environment.GetEnvironmentVariable("HSM_CONTAINER_ID");
129-
var hsmLogContainerId = Environment.GetEnvironmentVariable("HSM_LOGS_CONTAINER_ID");
128+
var hsmDataContainerId = Settings.DeploymentOutputs["HSM_CONTAINER_ID"];
129+
var hsmLogContainerId = Settings.DeploymentOutputs["HSM_LOGS_CONTAINER_ID"];
130130

131131
var result = await CallToolAsync(
132132
"managedlustre_fs_create",
@@ -232,8 +232,8 @@ public async Task Should_check_subnet_size_and_succeed()
232232
{ "subscription", Settings.SubscriptionId },
233233
{ "sku", "AMLFS-Durable-Premium-40" },
234234
{ "size", 480 },
235-
{ "location", Environment.GetEnvironmentVariable("LOCATION") },
236-
{ "subnet-id", Environment.GetEnvironmentVariable("AMLFS_SUBNET_ID") }
235+
{ "location", Settings.DeploymentOutputs["LOCATION"] },
236+
{ "subnet-id", Settings.DeploymentOutputs["AMLFS_SUBNET_ID"] }
237237
});
238238

239239
var valid = result.AssertProperty("valid");
@@ -251,8 +251,8 @@ public async Task Should_check_subnet_size_and_fail()
251251
{ "subscription", Settings.SubscriptionId },
252252
{ "sku", "AMLFS-Durable-Premium-40" },
253253
{ "size", 1008 },
254-
{ "location", Environment.GetEnvironmentVariable("LOCATION") },
255-
{ "subnet-id", Environment.GetEnvironmentVariable("AMLFS_SUBNET_SMALL_ID") }
254+
{ "location", Settings.DeploymentOutputs["LOCATION"] },
255+
{ "subnet-id", Settings.DeploymentOutputs["AMLFS_SUBNET_SMALL_ID"] }
256256
});
257257

258258
var valid = result.AssertProperty("valid");

0 commit comments

Comments
 (0)