Skip to content

Commit 01a8798

Browse files
natemcmasternatemcmaster
authored
Update links and disable warnings related to tests that don't work in Helix (#10427)
1 parent 26b5323 commit 01a8798

File tree

38 files changed

+93
-46
lines changed

38 files changed

+93
-46
lines changed

‎docs/Helix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ Most tests that don't just work on helix automatically are ones that depend on t
6161
## How to skip tests on helix
6262
There are two main ways to opt out of helix
6363
- Skipping the entire test project via `<BuildHelixPayload>false</BuildHelixPayload>` in csproj (the default value for this is IsTestProject).
64-
- Skipping an individual test via `[SkipOnHelix]` which might require including a compile reference to: `<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />`
64+
- Skipping an individual test via `[SkipOnHelix("url to github issue")]` which might require including a compile reference to: `<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />`
6565

6666
Make sure to file an issue for any skipped tests and include that in a comment next to either of these

‎src/Analyzers/Analyzers/test/AnalyzerTestBase.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ private static string GetProjectDirectory()
5151
return AppContext.BaseDirectory;
5252
}
5353

54+
// This test code needs to be updated to support distributed testing.
55+
// See https://github.com/aspnet/AspNetCore/issues/10422
56+
#pragma warning disable 0618
5457
var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Analyzers");
58+
#pragma warning restore 0618
5559
var projectDirectory = Path.Combine(solutionDirectory, "Analyzers", "test");
5660
return projectDirectory;
5761
}

‎src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RootNamespace>Microsoft.AspNetCore.Analyzers</RootNamespace>
77

88
<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
9-
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
9+
<!-- https://github.com/aspnet/AspNetCore/issues/10422 -->
1010
<BuildHelixPayload>false</BuildHelixPayload>
1111
<BaseOutputPath />
1212
<OutputPath />

‎src/Components/Blazor/Build/test/RuntimeDependenciesResolverTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public RuntimeDependenciesResolverTest(ITestOutputHelper output)
2121
}
2222

2323
[ConditionalFact]
24-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
24+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/10426")]
2525
public void FindsReferenceAssemblyGraph_ForStandaloneApp()
2626
{
2727
// Arrange

‎src/Components/Components/test/RendererTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,7 @@ public void CanTriggerRenderingSynchronouslyFromInsideAfterRenderCallback()
25772577
}
25782578

25792579
[ConditionalFact]
2580-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7487
2580+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7487")]
25812581
public async Task CanTriggerEventHandlerDisposedInEarlierPendingBatchAsync()
25822582
{
25832583
// This represents the scenario where the same event handler is being triggered

‎src/DataProtection/Extensions/test/DataProtectionProviderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void System_UsesProvidedDirectory_WithConfigurationCallback()
117117
[ConditionalFact]
118118
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2177", FlakyOn.AzP.Windows)]
119119
[X509StoreIsAvailable(StoreName.My, StoreLocation.CurrentUser)]
120-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6720
120+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
121121
public void System_UsesProvidedDirectoryAndCertificate()
122122
{
123123
var filePath = Path.Combine(GetTestFilesPath(), "TestCert.pfx");
@@ -167,7 +167,7 @@ public void System_UsesProvidedDirectoryAndCertificate()
167167

168168
[ConditionalFact]
169169
[X509StoreIsAvailable(StoreName.My, StoreLocation.CurrentUser)]
170-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6720
170+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
171171
public void System_UsesProvidedCertificateNotFromStore()
172172
{
173173
using (var store = new X509Store(StoreName.My, StoreLocation.CurrentUser))

‎src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netcoreapp3.0</TargetFramework>
55

66
<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
7-
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
7+
<!-- https://github.com/aspnet/AspNetCore/issues/10424 -->
88
<BuildHelixPayload>false</BuildHelixPayload>
99
<BaseOutputPath />
1010
<OutputPath />

‎src/Hosting/Hosting/test/WebHostTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public async Task WebHostShutsDownWhenTokenTriggers()
199199
}
200200

201201
[ConditionalFact]
202-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7291
202+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7291")]
203203
public async Task WebHostStopAsyncUsesDefaultTimeoutIfGivenTokenDoesNotFire()
204204
{
205205
var data = new Dictionary<string, string>
@@ -315,7 +315,7 @@ public async Task WebHostStopAsyncCanBeCancelledEarly()
315315
}
316316

317317
[ConditionalFact]
318-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7291
318+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7291")]
319319
public void WebHostApplicationLifetimeEventsOrderedCorrectlyDuringShutdown()
320320
{
321321
using (var host = CreateBuilder()

‎src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netcoreapp3.0</TargetFramework>
55

66
<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
7-
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
7+
<!-- https://github.com/aspnet/AspNetCore/issues/8247 -->
88
<BuildHelixPayload>false</BuildHelixPayload>
99
<BaseOutputPath />
1010
<OutputPath />

‎src/Hosting/test/FunctionalTests/ShutdownTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@ private async Task ExecuteShutdownTest(string testName, string shutdownMechanic)
4949
{
5050
var logger = loggerFactory.CreateLogger(testName);
5151

52+
// https://github.com/aspnet/AspNetCore/issues/8247
53+
#pragma warning disable 0618
5254
var applicationPath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), "test", "testassets",
5355
"Microsoft.AspNetCore.Hosting.TestSites");
56+
#pragma warning restore 0618
5457

5558
var deploymentParameters = new DeploymentParameters(
5659
applicationPath,

‎src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ public async Task InjectedStartup_DefaultApplicationNameIsEntryAssembly(TestVari
2828
{
2929
var logger = loggerFactory.CreateLogger(nameof(InjectedStartup_DefaultApplicationNameIsEntryAssembly));
3030

31+
// https://github.com/aspnet/AspNetCore/issues/8247
32+
#pragma warning disable 0618
3133
var applicationPath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), "test", "testassets", "IStartupInjectionAssemblyName");
34+
#pragma warning restore 0618
3235

3336
var deploymentParameters = new DeploymentParameters(variant)
3437
{

‎src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public class ConfigureSigningCredentialsTests
2222
UnsafeEphemeralKeySet : (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? X509KeyStorageFlags.PersistKeySet :
2323
X509KeyStorageFlags.DefaultKeySet);
2424

25-
[ConditionalFact]
26-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6720
25+
[ConditionalFact]
26+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
2727
[FrameworkSkipCondition(RuntimeFrameworks.CLR)]
2828
public void Configure_AddsDevelopmentKeyFromConfiguration()
2929
{
@@ -64,7 +64,7 @@ public void Configure_AddsDevelopmentKeyFromConfiguration()
6464
}
6565

6666
[ConditionalFact]
67-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6720
67+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
6868
public void Configure_LoadsPfxCertificateCredentialFromConfiguration()
6969
{
7070
// Arrange
@@ -94,7 +94,7 @@ public void Configure_LoadsPfxCertificateCredentialFromConfiguration()
9494
}
9595

9696
[ConditionalFact]
97-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6720
97+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
9898
public void Configure_LoadsCertificateStoreCertificateCredentialFromConfiguration()
9999
{
100100
try

‎src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class SigningKeysLoaderTests
2424
[Fact]
2525
public void LoadFromFile_ThrowsIfFileDoesNotExist()
2626
{
27-
// Arrange, Act & Assert
27+
// Arrange, Act & Assert
2828
var exception = Assert.Throws<InvalidOperationException>(() => SigningKeysLoader.LoadFromFile("./nonexisting.pfx", "", DefaultFlags));
2929
Assert.Equal($"There was an error loading the certificate. The file './nonexisting.pfx' was not found.", exception.Message);
3030
}
@@ -58,8 +58,8 @@ public static void LoadFromStoreCert_ThrowsIfThereIsNoCertificateAvailable()
5858
Assert.Equal("Couldn't find a valid certificate with subject 'Invalid' on the 'CurrentUser\\My'", exception.Message);
5959
}
6060

61-
[ConditionalFact]
62-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6720
61+
[ConditionalFact]
62+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
6363
public static void LoadFromStoreCert_SkipsCertificatesNotYetValid()
6464
{
6565
try
@@ -81,8 +81,8 @@ public static void LoadFromStoreCert_SkipsCertificatesNotYetValid()
8181
}
8282
}
8383

84-
[ConditionalFact]
85-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6720
84+
[ConditionalFact]
85+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
8686
public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate()
8787
{
8888
try
@@ -104,8 +104,8 @@ public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate()
104104
}
105105
}
106106

107-
[ConditionalFact]
108-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6720
107+
[ConditionalFact]
108+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
109109
public static void LoadFromStoreCert_SkipsExpiredCertificates()
110110
{
111111
try

‎src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<DefaultItemExcludes>$(DefaultItemExcludes);node_modules\**\*</DefaultItemExcludes>
77

88
<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
9-
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
9+
<!-- https://github.com/aspnet/AspNetCore/issues/7990 -->
1010
<BuildHelixPayload>false</BuildHelixPayload>
1111
<BaseOutputPath />
1212
<OutputPath />

‎src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ public async Task RunClientTests(string startup)
6868

6969
private static async Task<SamplesDeploymentResult> CreateDeployments(ILoggerFactory loggerFactory, string startup)
7070
{
71+
// https://github.com/aspnet/AspNetCore/issues/7990
72+
#pragma warning disable 0618
7173
var solutionPath = TestPathUtilities.GetSolutionRootDirectory("Middleware");
74+
#pragma warning restore 0618
7275

7376
var configuration =
7477
#if RELEASE

‎src/MusicStore/test/MusicStore.E2ETests/Common/Helpers.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ public class Helpers
99
{
1010
public static string GetApplicationPath()
1111
{
12+
// https://github.com/aspnet/AspNetCore/issues/8343
13+
#pragma warning disable 0618
1214
var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("MusicStore");
15+
#pragma warning restore 0618
1316
return Path.GetFullPath(Path.Combine(solutionDirectory, "samples", "MusicStore"));
1417
}
1518

‎src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
1010
<!-- Temporarily suppress warnings about Microsoft.AspNetCore.Server.IntegrationTesting -->
1111
<NoWarn>$(NoWarn);NU1605</NoWarn>
12-
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
12+
<!-- https://github.com/aspnet/AspNetCore/issues/8343 -->
1313
<BuildHelixPayload>false</BuildHelixPayload>
1414
<IsTestProject>false</IsTestProject>
1515
<IsReferenceAssemblyProject>false</IsReferenceAssemblyProject>

‎src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@ public static TestSource Read(string testClassName, string testMethod)
2727

2828
private static string GetProjectDirectory()
2929
{
30-
// On helix we use the published test files
30+
// On helix we use the published test files
3131
if (SkipOnHelixAttribute.OnHelix())
3232
{
3333
return AppContext.BaseDirectory;
3434
}
3535

36+
// https://github.com/aspnet/AspNetCore/issues/9431
37+
#pragma warning disable 0618
3638
var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
39+
#pragma warning restore 0618
3740
var projectDirectory = Path.Combine(solutionDirectory, "Mvc.Analyzers", "test");
3841
return projectDirectory;
3942
}

‎src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RootNamespace>Microsoft.AspNetCore.Mvc.Analyzers</RootNamespace>
77

88
<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
9-
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
9+
<!-- https://github.com/aspnet/AspNetCore/issues/9431 -->
1010
<BuildHelixPayload>false</BuildHelixPayload>
1111
<BaseOutputPath />
1212
<OutputPath />

‎src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@ public static TestSource Read(string testClassName, string testMethod)
2727

2828
private static string GetProjectDirectory()
2929
{
30-
// On helix we use the published test files
30+
// On helix we use the published test files
3131
if (SkipOnHelixAttribute.OnHelix())
3232
{
3333
return AppContext.BaseDirectory;
3434
}
3535

36+
// https://github.com/aspnet/AspNetCore/issues/9431
37+
#pragma warning disable 0618
3638
var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
39+
#pragma warning restore 0618
3740
var projectDirectory = Path.Combine(solutionDirectory, "Mvc.Api.Analyzers", "test");
3841
return projectDirectory;
3942
}

‎src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RootNamespace>Microsoft.AspNetCore.Mvc.Api.Analyzers</RootNamespace>
66

77
<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
8-
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
8+
<!-- https://github.com/aspnet/AspNetCore/issues/9431 -->
99
<BuildHelixPayload>false</BuildHelixPayload>
1010
<BaseOutputPath />
1111
<OutputPath />

‎src/Mvc/test/Mvc.FunctionalTests/Infrastructure/ResourceFile.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,11 @@ public static void UpdateFile(Assembly assembly, string resourceName, string pre
191191
{
192192
// The build system compiles every file under the resources folder as a resource available at runtime
193193
// with the same name as the file name. Need to update this file on disc.
194+
195+
// https://github.com/aspnet/AspNetCore/issues/10423
196+
#pragma warning disable 0618
194197
var solutionPath = TestPathUtilities.GetSolutionRootDirectory("Mvc");
198+
#pragma warning restore 0618
195199
var projectPath = Path.Combine(solutionPath, "test", assembly.GetName().Name);
196200
var fullPath = Path.Combine(projectPath, resourceName);
197201
WriteFile(fullPath, content);

‎src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<TestGroupName>Mvc.FunctionalTests</TestGroupName>
1010
<!-- The test asset projects this depends on are not strong-named. -->
1111
<SignAssembly>false</SignAssembly>
12-
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
12+
<!-- https://github.com/aspnet/AspNetCore/issues/10423 -->
1313
<BuildHelixPayload>false</BuildHelixPayload>
1414
</PropertyGroup>
1515

‎src/Security/Authentication/test/SecureDataFormatTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void ProtectWithPurposeRoundTrips()
4949
}
5050

5151
[ConditionalFact]
52-
[SkipOnHelix]
52+
[SkipOnHelix("https://github.com/aspnet/AspNetCore-Internal/issues/1974")]
5353
public void UnprotectWithDifferentPurposeFails()
5454
{
5555
var provider = ServiceProvider.GetRequiredService<IDataProtectionProvider>();

‎src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ public class StartupTimeBenchmark
2020
[IterationSetup]
2121
public void Setup()
2222
{
23+
// Deployers do not work in distributed environments
24+
// see https://github.com/aspnet/AspNetCore/issues/10268 and https://github.com/aspnet/Extensions/issues/1697
25+
#pragma warning disable 0618
2326
var deploymentParameters = new DeploymentParameters(Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "test/testassets/InProcessWebSite"),
2427
ServerType.IISExpress,
2528
RuntimeFlavor.CoreClr,
2629
RuntimeArchitecture.x64)
2730
{
31+
#pragma warning restore 0618
2832
ServerConfigTemplateContent = File.ReadAllText("IISExpress.config"),
2933
SiteName = "HttpTestSite",
3034
TargetFramework = "netcoreapp2.1",

‎src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ public async Task StartsWithDotnetOnThePath(string path)
113113
[SkipIfNotAdmin]
114114
[RequiresNewShim]
115115
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
116-
[SkipOnHelix]
117-
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2221", FlakyOn.Helix.All)]
116+
[SkipOnHelix("https://github.com/aspnet/AspNetCore-Internal/issues/2221")]
118117
public async Task StartsWithDotnetInstallLocation(RuntimeArchitecture runtimeArchitecture)
119118
{
120119
var deploymentParameters = Fixture.GetBaseDeploymentParameters();

‎src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedApplicationPublisher.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ public override Task<PublishedApplication> Publish(DeploymentParameters deployme
4242

4343
private string GetProjectReferencePublishLocation(DeploymentParameters deploymentParameters)
4444
{
45+
// Deployers do not work in distributed environments
46+
// see https://github.com/aspnet/AspNetCore/issues/10268 and https://github.com/aspnet/Extensions/issues/1697
47+
#pragma warning disable 0618
4548
var testAssetsBasePath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "IIS", "test", "testassets", _applicationName);
49+
#pragma warning restore 0618
4650
var configuration = this.GetType().GetTypeInfo().Assembly.GetCustomAttribute<AssemblyConfigurationAttribute>().Configuration;
4751
var path = Path.Combine(testAssetsBasePath, "bin", configuration, deploymentParameters.TargetFramework, "publish", GetProfileName(deploymentParameters));
4852
return path;

‎src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@ public class MofFileTests
1515
[ConditionalFact]
1616
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
1717
[RequiresIIS(IISCapability.TracingModule)]
18-
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2222", FlakyOn.Helix.All)]
19-
[SkipOnHelix]
18+
[SkipOnHelix("https://github.com/aspnet/AspNetCore-Internal/issues/2222")]
2019
public void CheckMofFile()
2120
{
21+
// This test code needs to be updated to support distributed testing.
22+
// See https://github.com/aspnet/AspNetCore-Internal/issues/2222
23+
#pragma warning disable 0618
2224
var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "aspnetcoremodulev2", "aspnetcore", "ancm.mof");
25+
#pragma warning restore 0618
2326
var process = Process.Start("mofcomp.exe", path);
2427
process.WaitForExit();
2528
Assert.Equal(0, process.ExitCode);

‎src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class AddressRegistrationTests : TestApplicationErrorLoggerLoggedTest
3434

3535
[ConditionalFact]
3636
[HostNameIsReachable]
37-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7267
37+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7267")]
3838
public async Task RegisterAddresses_HostName_Success()
3939
{
4040
var hostName = Dns.GetHostName();
@@ -335,7 +335,7 @@ public async Task ListenAnyIP_IPv6_Success()
335335

336336
[ConditionalFact]
337337
[HostNameIsReachable]
338-
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7267
338+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7267")]
339339
public async Task ListenAnyIP_HostName_Success()
340340
{
341341
var hostName = Dns.GetHostName();

0 commit comments

Comments
 (0)