Remove expected failure check since restore uses correct RID

dotnet · Aug 19, 2024 · 9da2829 · 9da2829
1 parent df0c4fc
commit 9da2829
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 23 deletions.
diff --git a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs
@@ -56,13 +56,14 @@ public static IEnumerable<object[]> GetImageData()
         public async void VerifyBlazorWasmScenario(ProductImageData imageData)
         {
             // Test will fail on main branch since `dotnet workload install` does not work with an empty NuGet config.
-            bool failureExpected = !Config.IsNightlyRepo;
+            // Skip test for now, re-enable when https://github.com/dotnet/dotnet-docker/issues/5787 is closed.
+            if (!Config.IsNightlyRepo)
+            {
+                return;
+            }
 
             bool isAlpine = imageData.OS.StartsWith(OS.Alpine);
 
-            // Microsoft.NETCore.App.Runtime.Mono.linux-musl-arm* package does not exist
-            failureExpected |= isAlpine && imageData.IsArm;
-
             bool useWasmTools = true;
 
             // `wasm-tools` workload does not work on .NET 6 with CBL Mariner 2.0.
@@ -85,7 +86,7 @@ public async void VerifyBlazorWasmScenario(ProductImageData imageData)
             }
 
             using BlazorWasmScenario testScenario = new(imageData, DockerHelper, OutputHelper, useWasmTools);
-            await testScenario.ExecuteAsync(shouldThrow: failureExpected);
+            await testScenario.ExecuteAsync();
         }
 
         [LinuxImageTheory]

diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/AspireDashboardBasicScenario.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/AspireDashboardBasicScenario.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.DotNet.Docker.Tests;
 
-public class AspireDashboardBasicScenario : TestScenario
+public class AspireDashboardBasicScenario : ITestScenario
 {
     private readonly DockerHelper _dockerHelper;
 
@@ -31,7 +31,7 @@ public AspireDashboardBasicScenario(
         _imageTag = _imageData.GetImage(DotNetImageRepo.Aspire_Dashboard, _dockerHelper);
     }
 
-    protected override async Task ExecuteInternalAsync()
+    public async Task ExecuteAsync()
     {
         string containerName = _imageData.GetIdentifier(nameof(AspireDashboardBasicScenario));
 

diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ITestScenario.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ITestScenario.cs
@@ -4,23 +4,11 @@
 
 #nullable enable
 
-using System;
 using System.Threading.Tasks;
-using Xunit;
 
 namespace Microsoft.DotNet.Docker.Tests;
 
-public abstract class TestScenario
+public interface ITestScenario
 {
-    public Task ExecuteAsync(bool shouldThrow = false)
-    {
-        if (shouldThrow)
-        {
-            return Assert.ThrowsAnyAsync<Exception>(ExecuteInternalAsync);
-        }
-
-        return ExecuteInternalAsync();
-    }
-
-    protected abstract Task ExecuteInternalAsync();
+    Task ExecuteAsync();
 }
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.DotNet.Docker.Tests;
 
-public abstract class ProjectTemplateTestScenario : TestScenario, IDisposable
+public abstract class ProjectTemplateTestScenario : ITestScenario, IDisposable
 {
     private bool _disposed;
 
@@ -113,7 +113,7 @@ protected string Build(string stageTarget, string[]? customBuildArgs)
         return tag;
     }
 
-    protected override async Task ExecuteInternalAsync()
+    public async Task ExecuteAsync()
     {
         List<string> tags = [];