Run globalization tests on aspnet images

dotnet · Nov 6, 2024 · 3b01e6e · 3b01e6e
1 parent 5a34536
commit 3b01e6e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs
@@ -30,6 +30,11 @@ public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
             await scenario.ExecuteAsync();
         }
 
+        [DotNetTheory]
+        [MemberData(nameof(GetImageData))]
+        public async Task VerifyGlobalizationScenario(ProductImageData imageData) =>
+            await VerifyGlobalizationScenarioBase(imageData);
+
         [DotNetTheory]
         [MemberData(nameof(GetImageData))]
         public void VerifyEnvironmentVariables(ProductImageData imageData)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/CommonRuntimeImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/CommonRuntimeImageTests.cs
@@ -5,8 +5,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
+using Microsoft.DotNet.Docker.Tests.TestScenarios;
 
 namespace Microsoft.DotNet.Docker.Tests
 {
@@ -79,5 +81,20 @@ protected void VerifyCommonShellNotInstalledForDistroless(ProductImageData image
 
             Assert.Contains("Exit code: 127", ex.Message);
         }
+
+        protected async Task VerifyGlobalizationScenarioBase(ProductImageData imageData)
+        {
+            // Inclusion of tzdata and icu together was not consistent in .NET 6, so skip the test.
+            // Remove once .NET 6 is EOL.
+            if (imageData.Version.Major == 6)
+            {
+                return;
+            }
+
+            using (GlobalizationScenario testScenario = new(imageData, ImageRepo, DockerHelper))
+            {
+                await testScenario.ExecuteAsync();
+            }
+        }
     }
 }
diff --git a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs
@@ -44,20 +44,8 @@ public async Task VerifyTestProjectScenario(ProductImageData imageData)
 
         [DotNetTheory]
         [MemberData(nameof(GetImageData))]
-        public async Task VerifyGlobalizationScenario(ProductImageData imageData)
-        {
-            // Inclusion of tzdata and icu together was not consistent in .NET 6, so skip the test.
-            // Remove once .NET 6 is EOL.
-            if (imageData.Version.Major == 6)
-            {
-                return;
-            }
-
-            using (GlobalizationScenario testScenario = new(imageData, ImageRepo, DockerHelper))
-            {
-                await testScenario.ExecuteAsync();
-            }
-        }
+        public async Task VerifyGlobalizationScenario(ProductImageData imageData) =>
+            await VerifyGlobalizationScenarioBase(imageData);
 
         [DotNetTheory]
         [MemberData(nameof(GetImageData))]