Skip to content

Commit

Permalink
Merge pull request dotnet#4168 from StephenBonikowsky/stebon/master/i…
Browse files Browse the repository at this point in the history 
…nfrastructureupdates

Remove UAP from test attribute skipping logic.
  • Loading branch information
@StephenBonikowsky
StephenBonikowsky authored Feb 21, 2020
2 parents 5fc8a7a + c147d43 commit d13d9e2
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 20 deletions.
1 change: 0 additions & 1 deletion ...te.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public static void NotExistentHost_Throws_EndpointNotFoundException()
}

[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/1717")]
[OuterLoop]
public static void ServiceRestart_Throws_CommunicationException()
{
Expand Down
15 changes: 0 additions & 15 deletions ...tem.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
public class WebSocketTests : ConditionalWcfTest
{
[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
public static void WebSocket_Http_RequestReply_BinaryStreamed()
Expand Down Expand Up @@ -78,7 +77,6 @@ public static void WebSocket_Http_RequestReply_BinaryStreamed()

[WcfFact]
[OuterLoop]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
public static void WebSocket_Http_Duplex_BinaryStreamed()
{
Expand Down Expand Up @@ -171,7 +169,6 @@ public static void WebSocket_Http_Duplex_BinaryStreamed()

[WcfFact]
[Condition(nameof(Root_Certificate_Installed))]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(3572, OS = OSID.OSX_10_14)]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
Expand Down Expand Up @@ -268,7 +265,6 @@ public static void WebSocket_Https_Duplex_BinaryStreamed()
}

[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(3572, OS = OSID.OSX_10_14)]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
Expand Down Expand Up @@ -365,7 +361,6 @@ public static void WebSocket_Https_Duplex_TextStreamed()
}

[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
public static void WebSocket_Http_Duplex_TextStreamed()
Expand Down Expand Up @@ -458,7 +453,6 @@ public static void WebSocket_Http_Duplex_TextStreamed()
}

[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
public static void WebSocket_Http_RequestReply_TextStreamed()
Expand Down Expand Up @@ -646,7 +640,6 @@ public static void WebSocket_WSScheme_WSTransportUsageAlways_DuplexCallback_Guid

[WcfFact]
[Condition(nameof(Root_Certificate_Installed))]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(3572, OS = OSID.OSX_10_14)]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
Expand Down Expand Up @@ -700,7 +693,6 @@ public static void WebSocket_Https_RequestReply_BinaryBuffered()

[WcfFact]
[Condition(nameof(Root_Certificate_Installed))]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(3572, OS = OSID.OSX_10_14)]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
Expand Down Expand Up @@ -756,7 +748,6 @@ public static void WebSocket_Https_RequestReply_TextBuffered_KeepAlive()

[WcfFact]
[Condition(nameof(Root_Certificate_Installed))]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(3572, OS = OSID.OSX_10_14)]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
Expand Down Expand Up @@ -825,7 +816,6 @@ public static void WebSocket_Https_Duplex_BinaryBuffered()

[WcfFact]
[Condition(nameof(Root_Certificate_Installed))]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(3572, OS = OSID.OSX_10_14)]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
Expand Down Expand Up @@ -893,7 +883,6 @@ public static void WebSocket_Https_Duplex_TextBuffered_KeepAlive()
}

[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
public static void WebSocket_Http_RequestReply_TextBuffered()
Expand Down Expand Up @@ -943,7 +932,6 @@ public static void WebSocket_Http_RequestReply_TextBuffered()
}

[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
public static void WebSocket_Http_RequestReply_BinaryBuffered_KeepAlive()
Expand Down Expand Up @@ -994,7 +982,6 @@ public static void WebSocket_Http_RequestReply_BinaryBuffered_KeepAlive()
}

[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
public static void WebSocket_Http_Duplex_TextBuffered_KeepAlive()
Expand Down Expand Up @@ -1058,7 +1045,6 @@ public static void WebSocket_Http_Duplex_TextBuffered_KeepAlive()
}

[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
public static void WebSocket_Http_Duplex_BinaryBuffered()
Expand Down Expand Up @@ -1124,7 +1110,6 @@ public static void WebSocket_Http_Duplex_BinaryBuffered()
// When not using a callback you can still force WCF to use WebSockets.
// This test verifies that it actually uses WebSockets when not using a callback.
[WcfFact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/526")]
[Issue(1438, OS = OSID.Windows_7)] // not supported on Win7
[OuterLoop]
public static void WebSocket_Http_VerifyWebSocketsUsed()
Expand Down
2 changes: 0 additions & 2 deletions ...eModel/tests/Scenarios/Security/TransportSecurity/Http/ClientCredentialTypeTests.4.1.0.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public static class Http_ClientCredentialTypeTests
{
[WcfFact]
[OuterLoop]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/3333")]
public static void DigestAuthentication_Echo_RoundTrips_String_No_Domain()
{
ChannelFactory<IWcfService> factory = null;
Expand Down Expand Up @@ -80,7 +79,6 @@ public static void DigestAuthentication_Echo_RoundTrips_String_No_Domain()

[WcfFact]
[OuterLoop]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: Expect100Continue header is not supported in UWP.")]
public static void HttpExpect100Continue_DigestAuthentication_True()
{
ChannelFactory<IWcfService> factory = null;
Expand Down
1 change: 0 additions & 1 deletion ...Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.0.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ public static void ClientCertificate_EchoString()
nameof(Server_Accepts_Certificates),
nameof(SSL_Available))]
[OuterLoop]
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: Expect100Continue header is not supported in UWP.")]
public static void HttpExpect100Continue_ClientCertificate_True()
{
string clientCertThumb = null;
Expand Down
1 change: 0 additions & 1 deletion ...Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public static void Https_SecModeTrans_CertValMode_PeerTrust_Succeeds_In_TrustedP
nameof(Peer_Certificate_Installed),
nameof(SSL_Available))]
[Issue(1945, OS = OSID.AnyOSX)] // OSX doesn't support the TrustedPeople certificate store
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Issue: https://github.com/dotnet/wcf/issues/3112")]
[OuterLoop]
// Asking for PeerTrust alone should throw SecurityNegotiationException
// if the certificate is not in the TrustedPeople store. For this test
Expand Down

0 comments on commit d13d9e2

Please sign in to comment.