Skip to content

Commit ce916ca

Browse files
github-actions[bot]nagilson
github-actions[bot]
and
nagilson
authored
[release/10.0.1xx-preview7] Cherry-pick @nagilson's containers test skips because of backport issues (#49895)
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
1 parent d90167a commit ce916ca

File tree

5 files changed

+27
-23
lines changed

5 files changed

+27
-23
lines changed

‎test/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public CreateImageIndexTests(ITestOutputHelper testOutput)
2222
_testOutput = testOutput;
2323
}
2424

25-
[DockerAvailableFact]
25+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
2626
public async Task CreateImageIndex_Baseline()
2727
{
2828
DirectoryInfo newProjectDir = CreateNewProject();

‎test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput)
2020
_testOutput = testOutput;
2121
}
2222

23-
[DockerAvailableFact]
23+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
2424
public void CreateNewImage_Baseline()
2525
{
2626
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -70,7 +70,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task)
7070
return new(task.GeneratedContainerConfiguration);
7171
}
7272

73-
[DockerAvailableFact]
73+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
7474
public void ParseContainerProperties_EndToEnd()
7575
{
7676
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -133,7 +133,7 @@ public void ParseContainerProperties_EndToEnd()
133133
/// <summary>
134134
/// Creates a console app that outputs the environment variable added to the image.
135135
/// </summary>
136-
[DockerAvailableFact]
136+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
137137
public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
138138
{
139139
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -218,7 +218,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
218218
.And.HaveStdOut("Foo");
219219
}
220220

221-
[DockerAvailableFact]
221+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
222222
public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
223223
{
224224
const string RootlessBase = "dotnet/rootlessbase";
@@ -299,7 +299,7 @@ public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
299299
}
300300

301301

302-
[DockerAvailableFact]
302+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
303303
public void CanOverrideContainerImageFormat()
304304
{
305305
DirectoryInfo newProjectDir = new(GetTestDirectoryName());

‎test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public DockerRegistryTests(ITestOutputHelper testOutput)
1717
_loggerFactory = new TestLoggerFactory(testOutput);
1818
}
1919

20-
[DockerAvailableFact]
20+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
2121
public async Task GetFromRegistry()
2222
{
2323
var loggerFactory = new TestLoggerFactory(_testOutput);

‎test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ internal static void ChangeTargetFrameworkAfterAppCreation(string path)
5555
File.WriteAllText(Path.Combine(path, csprojFilename), text);
5656
}
5757

58-
[DockerAvailableFact]
58+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
5959
public async Task ApiEndToEndWithRegistryPushAndPull()
6060
{
6161
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithRegistryPushAndPull));
@@ -102,7 +102,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull()
102102
}
103103
}
104104

105-
[DockerAvailableFact]
105+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
106106
public async Task ApiEndToEndWithLocalLoad()
107107
{
108108
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithLocalLoad));
@@ -143,7 +143,7 @@ public async Task ApiEndToEndWithLocalLoad()
143143
}
144144
}
145145

146-
[DockerAvailableFact]
146+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
147147
public async Task ApiEndToEndWithArchiveWritingAndLoad()
148148
{
149149
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad));
@@ -193,7 +193,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
193193
}
194194
}
195195

196-
[DockerAvailableFact]
196+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
197197
public async Task TarballsHaveCorrectStructure()
198198
{
199199
var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory,
@@ -367,7 +367,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
367367
return publishDirectory;
368368
}
369369

370-
[DockerAvailableFact]
370+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
371371
public async Task EndToEnd_MultiProjectSolution()
372372
{
373373
ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution));
@@ -453,7 +453,7 @@ public async Task EndToEnd_MultiProjectSolution()
453453
/// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport
454454
/// enabled by default, so the target will be skipped.
455455
/// </summary>
456-
[DockerAvailableFact]
456+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
457457
public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library()
458458
{
459459
ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library));
@@ -521,7 +521,7 @@ public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library()
521521
commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'");
522522
}
523523

524-
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/45181")]
524+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
525525
[InlineData("webapi", false)]
526526
[InlineData("webapi", true)]
527527
[InlineData("worker", false)]
@@ -695,7 +695,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
695695
privateNuGetAssets.Delete(true);
696696
}
697697

698-
[DockerAvailableTheory()]
698+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
699699
[InlineData(DockerRegistryManager.FullyQualifiedBaseImageAspNet)]
700700
[InlineData(DockerRegistryManager.FullyQualifiedBaseImageAspNetDigest)]
701701
public void EndToEnd_NoAPI_Console(string baseImage)
@@ -778,7 +778,7 @@ public void EndToEnd_NoAPI_Console(string baseImage)
778778
privateNuGetAssets.Delete(true);
779779
}
780780

781-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/45181")]
781+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
782782
public void EndToEnd_SingleArch_NoRid()
783783
{
784784
// Create a new console project
@@ -810,9 +810,10 @@ public void EndToEnd_SingleArch_NoRid()
810810
processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
811811
}
812812

813+
/**
813814
[InlineData("endtoendmultiarch-localregisty")]
814815
[InlineData("myteam/endtoendmultiarch-localregisty")]
815-
[DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
816+
[DockerIsAvailableAndSupportsArchTheory(Skip = "https://github.com/dotnet/sdk/issues/49502", "linux/arm64", checkContainerdStoreAvailability: true)]
816817
public void EndToEndMultiArch_LocalRegistry(string imageName)
817818
{
818819
string tag = "1.0";
@@ -867,8 +868,9 @@ public void EndToEndMultiArch_LocalRegistry(string imageName)
867868
// Cleanup
868869
newProjectDir.Delete(true);
869870
}
871+
*/
870872

871-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/45181")]
873+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
872874
public void MultiArchStillAllowsSingleRID()
873875
{
874876
string imageName = NewImageName();
@@ -919,7 +921,7 @@ public void MultiArchStillAllowsSingleRID()
919921
newProjectDir.Delete(true);
920922
}
921923

922-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/45181")]
924+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
923925
public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
924926
{
925927
string imageName = NewImageName();
@@ -991,9 +993,10 @@ private DirectoryInfo CreateNewProject(string template, string tfm = ToolsetInfo
991993
private string GetPublishArtifactsPath(string projectDir, string tfm, string rid, string configuration = "Debug")
992994
=> Path.Combine(projectDir, "bin", configuration, tfm, rid, "publish");
993995

996+
/**
994997
[InlineData("endtoendmultiarch-archivepublishing")]
995998
[InlineData("myteam/endtoendmultiarch-archivepublishing")]
996-
[DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
999+
[DockerIsAvailableAndSupportsArchTheory(Skip = "https://github.com/dotnet/sdk/issues/49502", "linux/arm64", checkContainerdStoreAvailability: true)]
9971000
public void EndToEndMultiArch_ArchivePublishing(string imageName)
9981001
{
9991002
string tag = "1.0";
@@ -1059,6 +1062,7 @@ public void EndToEndMultiArch_ArchivePublishing(string imageName)
10591062
// Cleanup
10601063
newProjectDir.Delete(true);
10611064
}
1065+
*/
10621066

10631067
[DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
10641068
public void EndToEndMultiArch_RemoteRegistry()
@@ -1381,7 +1385,7 @@ public void EndToEndMultiArch_Labels()
13811385
[DockerSupportsArchInlineData("linux/386", "linux-x86", "/app", Skip = "There's no apphost for linux-x86 so we can't execute self-contained, and there's no .NET runtime base image for linux-x86 so we can't execute framework-dependent.")]
13821386
[DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")]
13831387
[DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")]
1384-
[DockerAvailableTheory]
1388+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
13851389
public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir)
13861390
{
13871391
ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs));
@@ -1432,7 +1436,7 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir)
14321436
}
14331437
}
14341438

1435-
[DockerAvailableFact]
1439+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
14361440
public async void CheckDownloadErrorMessageWhenSourceRepositoryThrows()
14371441
{
14381442
var loggerFactory = new TestLoggerFactory(_testOutput);

‎test/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task Can_detect_when_no_daemon_is_running()
4141
}
4242
}
4343

44-
[DockerAvailableFact]
44+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
4545
public async Task Can_detect_when_daemon_is_running()
4646
{
4747
var available = await new DockerCli(_loggerFactory).IsAvailableAsync(default).ConfigureAwait(false);

0 commit comments

Comments
 (0)