Skip to content

Commit 52dea3f

Browse files
author
Mirroring
committed
Merge commit '4a12a5dcc34e068bcd2755126275e1586f3bedf3'
2 parents 581c4ef + 4a12a5d commit 52dea3f

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());
@@ -216,7 +216,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
216216
.And.HaveStdOut("Foo");
217217
}
218218

219-
[DockerAvailableFact]
219+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
220220
public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
221221
{
222222
const string RootlessBase = "dotnet/rootlessbase";
@@ -297,7 +297,7 @@ public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
297297
}
298298

299299

300-
[DockerAvailableFact]
300+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
301301
public void CanOverrideContainerImageFormat()
302302
{
303303
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
@@ -42,7 +42,7 @@ public void Dispose()
4242
_loggerFactory.Dispose();
4343
}
4444

45-
[DockerAvailableFact()]
45+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
4646
public async Task ApiEndToEndWithRegistryPushAndPull()
4747
{
4848
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithRegistryPushAndPull));
@@ -89,7 +89,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull()
8989
}
9090
}
9191

92-
[DockerAvailableFact()]
92+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
9393
public async Task ApiEndToEndWithLocalLoad()
9494
{
9595
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithLocalLoad));
@@ -130,7 +130,7 @@ public async Task ApiEndToEndWithLocalLoad()
130130
}
131131
}
132132

133-
[DockerAvailableFact()]
133+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
134134
public async Task ApiEndToEndWithArchiveWritingAndLoad()
135135
{
136136
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad));
@@ -180,7 +180,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
180180
}
181181
}
182182

183-
[DockerAvailableFact]
183+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
184184
public async Task TarballsHaveCorrectStructure()
185185
{
186186
var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory,
@@ -351,7 +351,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
351351
return publishDirectory;
352352
}
353353

354-
[DockerAvailableFact()]
354+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
355355
public async Task EndToEnd_MultiProjectSolution()
356356
{
357357
ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution));
@@ -441,7 +441,7 @@ public async Task EndToEnd_MultiProjectSolution()
441441
/// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport
442442
/// enabled by default, so the target will be skipped.
443443
/// </summary>
444-
[DockerAvailableFact]
444+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
445445
public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library()
446446
{
447447
ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library));
@@ -509,7 +509,7 @@ public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library()
509509
commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'");
510510
}
511511

512-
[DockerAvailableTheory()]
512+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
513513
[InlineData("webapi", false)]
514514
[InlineData("webapi", true)]
515515
[InlineData("worker", false)]
@@ -685,7 +685,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
685685
privateNuGetAssets.Delete(true);
686686
}
687687

688-
[DockerAvailableTheory()]
688+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
689689
[InlineData(DockerRegistryManager.FullyQualifiedBaseImageAspNet)]
690690
[InlineData(DockerRegistryManager.FullyQualifiedBaseImageAspNetDigest)]
691691
public void EndToEnd_NoAPI_Console(string baseImage)
@@ -768,7 +768,7 @@ public void EndToEnd_NoAPI_Console(string baseImage)
768768
privateNuGetAssets.Delete(true);
769769
}
770770

771-
[DockerAvailableFact]
771+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
772772
public void EndToEnd_SingleArch_NoRid()
773773
{
774774
// Create a new console project
@@ -801,9 +801,10 @@ public void EndToEnd_SingleArch_NoRid()
801801
processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
802802
}
803803

804+
/**
804805
[InlineData("endtoendmultiarch-localregisty")]
805806
[InlineData("myteam/endtoendmultiarch-localregisty")]
806-
[DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
807+
[DockerIsAvailableAndSupportsArchTheory(Skip = "https://github.com/dotnet/sdk/issues/49502", "linux/arm64", checkContainerdStoreAvailability: true)]
807808
public void EndToEndMultiArch_LocalRegistry(string imageName)
808809
{
809810
string tag = "1.0";
@@ -859,8 +860,9 @@ public void EndToEndMultiArch_LocalRegistry(string imageName)
859860
// Cleanup
860861
newProjectDir.Delete(true);
861862
}
863+
*/
862864

863-
[DockerAvailableFact]
865+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
864866
public void MultiArchStillAllowsSingleRID()
865867
{
866868
string imageName = NewImageName();
@@ -912,7 +914,7 @@ public void MultiArchStillAllowsSingleRID()
912914
newProjectDir.Delete(true);
913915
}
914916

915-
[DockerAvailableFact]
917+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
916918
public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
917919
{
918920
string imageName = NewImageName();
@@ -985,9 +987,10 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
985987
private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
986988
=> Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
987989

990+
/**
988991
[InlineData("endtoendmultiarch-archivepublishing")]
989992
[InlineData("myteam/endtoendmultiarch-archivepublishing")]
990-
[DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
993+
[DockerIsAvailableAndSupportsArchTheory(Skip = "https://github.com/dotnet/sdk/issues/49502", "linux/arm64", checkContainerdStoreAvailability: true)]
991994
public void EndToEndMultiArch_ArchivePublishing(string imageName)
992995
{
993996
string tag = "1.0";
@@ -1054,6 +1057,7 @@ public void EndToEndMultiArch_ArchivePublishing(string imageName)
10541057
// Cleanup
10551058
newProjectDir.Delete(true);
10561059
}
1060+
*/
10571061

10581062
[DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
10591063
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)