Skip to content

Commit 9ed6005

Browse files
committed
Fixing test break
1 parent e9b3b01 commit 9ed6005

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

test/WebJobs.Script.Tests.Integration/Host/StandbyManagerTests.cs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,13 @@ public async Task StandbyMode_EndToEnd_LinuxContainer()
157157

158158
var vars = new Dictionary<string, string>
159159
{
160-
{ EnvironmentSettingNames.ContainerName, "TestContainer" },
160+
{ EnvironmentSettingNames.ContainerName, "TestApp" },
161+
{ EnvironmentSettingNames.AzureWebsiteName, "TestApp" },
161162
{ EnvironmentSettingNames.ContainerEncryptionKey, encryptionKey },
162163
{ EnvironmentSettingNames.AzureWebsiteContainerReady, null },
163164
{ EnvironmentSettingNames.AzureWebsiteSku, "Dynamic" },
164165
{ EnvironmentSettingNames.AzureWebsiteZipDeployment, null },
166+
{ EnvironmentSettingNames.AzureWebJobsSecretStorageType, "Blob" },
165167
{ "AzureWebEncryptionKey", "0F75CA46E7EBDD39E4CA6B074D1F9A5972B849A55F91A248" }
166168
};
167169
using (var env = new TestScopedEnvironmentVariable(vars))
@@ -176,7 +178,10 @@ public async Task StandbyMode_EndToEnd_LinuxContainer()
176178

177179
// immediately call a function - expect the call to block until
178180
// the host is fully specialized
179-
var request = new HttpRequestMessage(HttpMethod.Get, "api/httptrigger");
181+
var secretManager = _httpServer.Host.Services.GetService<ISecretManager>();
182+
var keys = await secretManager.GetFunctionSecretsAsync("HttpTrigger");
183+
string key = keys.First().Value;
184+
var request = new HttpRequestMessage(HttpMethod.Get, $"api/httptrigger?code={key}");
180185
request.Headers.Add(ScriptConstants.AntaresColdStartHeaderName, "1");
181186
var response = await _httpClient.SendAsync(request);
182187
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -225,7 +230,14 @@ private async Task InitializeTestHost(string testDirName)
225230
{
226231
var httpConfig = new HttpConfiguration();
227232
var testRootPath = Path.Combine(Path.GetTempPath(), testDirName);
228-
await FileUtility.DeleteDirectoryAsync(testRootPath, true);
233+
try
234+
{
235+
await FileUtility.DeleteDirectoryAsync(testRootPath, true);
236+
}
237+
catch
238+
{
239+
// best effort cleanup
240+
}
229241

230242
_loggerProvider = new TestLoggerProvider();
231243
var loggerProviderFactory = new TestLoggerProviderFactory(_loggerProvider);
@@ -292,7 +304,7 @@ private async Task Assign(string encryptionKey)
292304
var assignmentContext = new HostAssignmentContext
293305
{
294306
SiteId = 1234,
295-
SiteName = "TestSite",
307+
SiteName = "TestApp",
296308
Environment = environment
297309
};
298310
var encryptedAssignmentContext = EncryptedHostAssignmentContext.Create(assignmentContext, encryptionKey);

0 commit comments

Comments
 (0)