Skip to content

Commit 0e9376e

Browse files
committed
Fix tests
1 parent 8d2b799 commit 0e9376e

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/BaseCustomRuntimeTest.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ namespace Amazon.Lambda.RuntimeSupport.IntegrationTests
1515
{
1616
public class BaseCustomRuntimeTest
1717
{
18+
protected readonly Runtime _providedRuntime = Runtime.ProvidedAl2023;
19+
1820
public const int FUNCTION_MEMORY_MB = 512;
1921

2022
public static readonly RegionEndpoint TestRegion = RegionEndpoint.USWest2;
@@ -110,13 +112,13 @@ await iamClient.DetachRolePolicyAsync(new DetachRolePolicyRequest
110112
}
111113

112114
public async Task<bool> PrepareTestResources(IAmazonS3 s3Client, IAmazonLambda lambdaClient,
113-
AmazonIdentityManagementServiceClient iamClient)
115+
AmazonIdentityManagementServiceClient iamClient, Runtime runtime)
114116
{
115117
var roleAlreadyExisted = await ValidateAndSetIamRoleArn(iamClient);
116118

117119
var testBucketName = TestBucketRoot + Guid.NewGuid().ToString();
118120
await CreateBucketWithDeploymentZipAsync(s3Client, testBucketName);
119-
await CreateFunctionAsync(lambdaClient, testBucketName);
121+
await CreateFunctionAsync(lambdaClient, testBucketName, runtime);
120122

121123
return roleAlreadyExisted;
122124
}
@@ -273,7 +275,7 @@ private async Task WaitForFunctionToBeReady(IAmazonLambda lambdaClient)
273275
await Task.Delay(1000);
274276
}
275277

276-
protected async Task CreateFunctionAsync(IAmazonLambda lambdaClient, string bucketName)
278+
protected async Task CreateFunctionAsync(IAmazonLambda lambdaClient, string bucketName, Runtime runtime)
277279
{
278280
await DeleteFunctionIfExistsAsync(lambdaClient);
279281

@@ -288,7 +290,7 @@ protected async Task CreateFunctionAsync(IAmazonLambda lambdaClient, string buck
288290
Handler = Handler,
289291
MemorySize = FUNCTION_MEMORY_MB,
290292
Timeout = 30,
291-
Runtime = Runtime.ProvidedAl2023,
293+
Runtime = runtime,
292294
Role = ExecutionRoleArn
293295
};
294296

Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/CustomRuntimeAspNetCoreMinimalApiCustomSerializerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public async Task TestMinimalApi()
3939

4040
try
4141
{
42-
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient);
42+
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient, _providedRuntime);
4343
await InvokeSuccessToWeatherForecastController(lambdaClient);
4444
}
4545
catch (NoDeploymentPackageFoundException)
@@ -69,7 +69,7 @@ public async Task TestThreadingLogging()
6969

7070
try
7171
{
72-
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient);
72+
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient, _providedRuntime);
7373
await InvokeLoggerTestController(lambdaClient);
7474
}
7575
catch (NoDeploymentPackageFoundException)

Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/CustomRuntimeAspNetCoreMinimalApiTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public async Task TestMinimalApi()
3939

4040
try
4141
{
42-
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient);
42+
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient, _providedRuntime);
4343
await InvokeSuccessToWeatherForecastController(lambdaClient);
4444
}
4545
catch (NoDeploymentPackageFoundException)
@@ -69,7 +69,7 @@ public async Task TestThreadingLogging()
6969

7070
try
7171
{
72-
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient);
72+
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient, _providedRuntime);
7373
await InvokeLoggerTestController(lambdaClient);
7474
}
7575
catch (NoDeploymentPackageFoundException)

Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/CustomRuntimeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected virtual async Task TestAllHandlersAsync()
6969

7070
try
7171
{
72-
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient);
72+
roleAlreadyExisted = await PrepareTestResources(s3Client, lambdaClient, iamClient, _providedRuntime);
7373

7474
await RunMaxHeapMemoryCheck(lambdaClient, "GetTotalAvailableMemoryBytes");
7575
await RunWithoutMaxHeapMemoryCheck(lambdaClient, "GetTotalAvailableMemoryBytes");

Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/ResponseStreamingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public async Task EnsureResourcesDeployedAsync(ResponseStreamingTests tests)
114114
return;
115115

116116
_tests = tests;
117-
_roleAlreadyExisted = await _tests.PrepareTestResources(_s3Client, _lambdaClient, _iamClient);
117+
_roleAlreadyExisted = await _tests.PrepareTestResources(_s3Client, _lambdaClient, _iamClient, Runtime.Dotnet10);
118118

119119
_resourcesCreated = true;
120120
}

0 commit comments

Comments
 (0)