Re-enable tests which were disabled due to fixed issues (#5701)

This commit is contained in:
Logan Bussell 2024-07-17 14:51:45 -07:00
Родитель b07f5f91b4
Коммит 2c1b0eedb9
5 изменённых файлов: 10 добавлений и 33 удалений

Просмотреть файл

@ -66,12 +66,6 @@ namespace Microsoft.DotNet.Docker.Tests
return;
}
if (imageData.OS == OS.Mariner20Distroless || imageData.OS == OS.AzureLinux30Distroless)
{
OutputHelper.WriteLine("Temporarily disable due to bash being installed. See https://github.com/dotnet/dotnet-docker/issues/3526");
return;
}
string imageTag = imageData.GetImage(ImageRepo, DockerHelper);
// Attempting to execute the container's shell should result in an exception.

Просмотреть файл

@ -26,13 +26,6 @@ namespace Microsoft.DotNet.Docker.Tests
[MemberData(nameof(GetImageData))]
public async Task VerifyAppScenario(ProductImageData imageData)
{
if (imageData.IsArm && imageData.OS == OS.Jammy)
{
OutputHelper.WriteLine(
"Skipping test due to https://github.com/dotnet/runtime/issues/66310. Re-enable when fixed.");
return;
}
using ConsoleAppScenario testScenario = new(imageData, DockerHelper, OutputHelper);
await testScenario.ExecuteAsync();
}

Просмотреть файл

@ -113,13 +113,6 @@ namespace Microsoft.DotNet.Docker.Tests
string output = DockerHelper.Run(appTag, containerName);
Assert.StartsWith("string: The quick brown fox jumps over the lazy dog", output);
if (!DockerHelper.IsLinuxContainerModeEnabled &&
DockerHelper.DockerArchitecture.StartsWith("arm", StringComparison.OrdinalIgnoreCase))
{
// Skipping run app tests due to a .NET issue: https://github.com/dotnet/runtime/issues/2082
return;
}
// Run the app's tests
DockerHelper.Build(testTag, dockerfilePath, target: "test", contextDir: sampleFolder);
DockerHelper.Run(testTag, testContainerName, skipAutoCleanup: true);

Просмотреть файл

@ -80,10 +80,13 @@ namespace Microsoft.DotNet.Docker.Tests
}
// `wasm-tools` workload does not work on ARM
// `wasm-tools` is also not supported on Alpine for .NET < 9 due to https://github.com/dotnet/sdk/issues/32327
int[] unsupportedVersionsForAlpine = [6, 8];
bool isSupportedVersionForAlpine = !unsupportedVersionsForAlpine.Contains(imageData.Version.Major);
bool useWasmTools = !imageData.IsArm && (!isAlpine || isSupportedVersionForAlpine);
bool useWasmTools = !imageData.IsArm;
// `wasm-tools` is not supported on Alpine for .NET < 9 due to https://github.com/dotnet/sdk/issues/32327
if (isAlpine && (imageData.Version.Major == 6 || imageData.Version.Major == 8))
{
useWasmTools = false;
}
using BlazorWasmScenario testScenario = new(imageData, DockerHelper, OutputHelper, useWasmTools);
await testScenario.ExecuteAsync();

Просмотреть файл

@ -134,17 +134,11 @@ Try {
# selected TestCategories (using an OR operator between each category).
# See https://docs.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests
$TestCategories | ForEach-Object {
# Skip pre-build tests on Windows because of missing pre-reqs (https://github.com/dotnet/dotnet-docker/issues/2261)
if ($_ -eq "pre-build" -and $activeOS -eq "windows") {
Write-Warning "Skipping pre-build tests for Windows containers"
if ($testFilter) {
$testFilter += "|"
}
else {
if ($testFilter) {
$testFilter += "|"
}
$testFilter += "Category=$_"
}
$testFilter += "Category=$_"
}
if (-not $testFilter) {