Skip to content

Commit 348ab7c

Browse files
committed
Reacting to testing changes
1 parent eea089a commit 348ab7c

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ namespace Microsoft.AspNet.IISPlatformHandler.FunctionalTests
1717
public class HelloWorldTests
1818
{
1919
[ConditionalTheory]
20-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
20+
[OSSkipCondition(OperatingSystems.Linux)]
21+
[OSSkipCondition(OperatingSystems.MacOSX)]
2122
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5061/", ServerType.Kestrel)]
2223
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5062/", ServerType.Kestrel)]
2324
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5063/", ServerType.Kestrel)]
@@ -28,7 +29,8 @@ public Task HelloWorld_IISExpress(RuntimeFlavor runtimeFlavor, RuntimeArchitectu
2829
}
2930

3031
[ConditionalTheory]
31-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
32+
[OSSkipCondition(OperatingSystems.Linux)]
33+
[OSSkipCondition(OperatingSystems.MacOSX)]
3234
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5065/", ServerType.Kestrel)]
3335
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5066/", ServerType.Kestrel)]
3436
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5067/", ServerType.Kestrel)]
@@ -40,7 +42,8 @@ public Task HelloWorld_IISExpress_NoSource(RuntimeFlavor runtimeFlavor, RuntimeA
4042

4143
[ConditionalTheory]
4244
[SkipIfIISVariationsNotEnabled]
43-
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux)]
45+
[OSSkipCondition(OperatingSystems.Linux)]
46+
[OSSkipCondition(OperatingSystems.MacOSX)]
4447
[SkipIfCurrentRuntimeIsCoreClr]
4548
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5069/", ServerType.Kestrel)]
4649
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5070/", ServerType.Kestrel)]

test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/HttpsTest.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ namespace Microsoft.AspNet.IISPlatformHandler.FunctionalTests
1818
public class HttpsTest
1919
{
2020
[ConditionalTheory]
21-
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux)]
21+
[OSSkipCondition(OperatingSystems.Linux)]
22+
[OSSkipCondition(OperatingSystems.MacOSX)]
2223
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "https://localhost:44399/")]
2324
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44398/")]
2425
public Task Https_HelloWorld(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -71,7 +72,8 @@ public async Task HttpsHelloWorld(ServerType serverType, RuntimeFlavor runtimeFl
7172
}
7273

7374
[ConditionalTheory]
74-
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux)]
75+
[OSSkipCondition(OperatingSystems.Linux)]
76+
[OSSkipCondition(OperatingSystems.MacOSX)]
7577
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44397/")]
7678
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "https://localhost:44396/")]
7779
public Task Https_HelloWorld_NoClientCert(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
@@ -80,7 +82,8 @@ public Task Https_HelloWorld_NoClientCert(RuntimeFlavor runtimeFlavor, RuntimeAr
8082
}
8183

8284
[ConditionalTheory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]
83-
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux)]
85+
[OSSkipCondition(OperatingSystems.Linux)]
86+
[OSSkipCondition(OperatingSystems.MacOSX)]
8487
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "https://localhost:44395/")]
8588
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44394/")]
8689
public Task Https_HelloWorld_ClientCert(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)

test/Microsoft.AspNet.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public class NtlmAuthenticationTests
1919
{
2020
// TODO: The middleware needs to implement auth handlers.
2121
[ConditionalTheory, Trait("ServerComparison.FunctionalTests", "ServerComparison.FunctionalTests")]
22-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
22+
[OSSkipCondition(OperatingSystems.Linux)]
23+
[OSSkipCondition(OperatingSystems.MacOSX)]
2324
[InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5050/")]
2425
[InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5051/")]
2526
public async Task NtlmAuthentication(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)

0 commit comments

Comments
 (0)