From 599ad8436e242f7db62a458e5bd0505dc3cd95d2 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Fri, 22 Nov 2024 09:23:37 -0800 Subject: [PATCH 1/3] Skip WebSocketOutOfProcessTests on Windows.Amd64.Server2022.Open --- .../test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs index 58b1c148ceb5..d4ce915cf951 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs @@ -23,7 +23,7 @@ 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;")] +[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;Windows.Amd64.Server2022.Open")] public class WebSocketsOutOfProcessTests : WebSocketsTests { public WebSocketsOutOfProcessTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(fixture, testOutput) From 3bdf81e32a6a4075b0661989ab876bd0c42ed562 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Fri, 22 Nov 2024 10:10:34 -0800 Subject: [PATCH 2/3] Use if-def from base class --- .../Common.FunctionalTests/WebSocketOutOfProcessTests.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs index d4ce915cf951..69a98c86875d 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs @@ -23,7 +23,12 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests; [Collection(IISTestSiteCollectionOutOfProc.Name)] [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 class WebSocketsOutOfProcessTests : WebSocketsTests { public WebSocketsOutOfProcessTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(fixture, testOutput) From 6768e325e0e6da596c19cdd8b2ab809674ed3684 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Fri, 22 Nov 2024 12:12:31 -0800 Subject: [PATCH 3/3] Fix in-proc and remove attributes from abstract class --- .../test/Common.FunctionalTests/WebSocketInProcessTests.cs | 7 ++++++- .../IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs | 7 ------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketInProcessTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketInProcessTests.cs index 0eff6ec45e0b..b4e7ddca7e0b 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketInProcessTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketInProcessTests.cs @@ -23,7 +23,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) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs index 323b7dd43e1d..c27926b6ccbd 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs @@ -28,13 +28,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; }