Skip WebSocketOutOfProcessTests on Windows.Amd64.Server2022.Open (#59112)

* Skip WebSocketOutOfProcessTests on Windows.Amd64.Server2022.Open

* Use if-def from base class

* Fix in-proc and remove attributes from abstract class

Author: captainsafia

src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketInProcessTests.cs

@@ -22,7 +22,12 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [Collection(IISTestSiteCollectionInProc.Name)]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
+#if IISEXPRESS_FUNCTIONALS
+[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open")]
+#else
+// These queues do not have websockets enabled currently for full IIS
+[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;Windows.Amd64.Server2022.Open")]
+#endif
 public class WebSocketsInProcessTests : WebSocketsTests
 {
     public WebSocketsInProcessTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(fixture, testOutput)

src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs

@@ -22,7 +22,12 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [Collection(IISTestSiteCollectionOutOfProc.Name)]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
+#if IISEXPRESS_FUNCTIONALS
+[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open")]
+#else
+// These queues do not have websockets enabled currently for full IIS
+[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;Windows.Amd64.Server2022.Open")]
+#endif
 public class WebSocketsOutOfProcessTests : WebSocketsTests
 {
     public WebSocketsOutOfProcessTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(fixture, testOutput)

src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs

@@ -27,13 +27,6 @@ namespace Microsoft.AspNetCore.Server.IIS.NewShim.FunctionalTests;
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
-[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
-#if IISEXPRESS_FUNCTIONALS
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open")]
-#else
-// These queues do not have websockets enabled currently for full IIS
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;Windows.Amd64.Server2022.Open")]
-#endif
 public abstract class WebSocketsTests : FunctionalTestsBase
 {
     public IISTestSiteFixture Fixture { get; }