File tree Expand file tree Collapse file tree 2 files changed +11
-3
lines changed
src/Servers/IIS/IIS/test/Common.FunctionalTests Expand file tree Collapse file tree 2 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,11 @@ internal IISTestSiteFixture(Action<IISDeploymentParameters> configure)
5050 // Uncomment to add IIS debug logs to test output.
5151 //DeploymentParameters.EnvironmentVariables.Add("ASPNETCORE_MODULE_DEBUG", "console");
5252
53- DeploymentParameters . EnableModule ( "WebSocketModule" , "%IIS_BIN%/iiswsock.dll" ) ;
53+ // This queue does not have websockets enabled currently, adding the module will break all tests using this fixture.
54+ if ( ! HelixHelper . GetTargetHelixQueue ( ) . ToLowerInvariant ( ) . Contains ( "windows.amd64.server2022" ) )
55+ {
56+ DeploymentParameters . EnableModule ( "WebSocketModule" , "%IIS_BIN%/iiswsock.dll" ) ;
57+ }
5458 }
5559
5660 public HttpClient Client => DeploymentResult . HttpClient ;
Original file line number Diff line number Diff line change @@ -29,15 +29,19 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
2929#endif
3030
3131[ MinimumOSVersion ( OperatingSystems . Windows , WindowsVersions . Win8 , SkipReason = "No WebSocket supported on Win7" ) ]
32- [ SkipOnHelix ( "Unsupported queue" , Queues = "Windows.Amd64.VS2022.Pre.Open;" ) ]
32+ #if IISEXPRESS_FUNCTIONALS
33+ [ SkipOnHelix ( "Unsupported queue" , Queues = "Windows.Amd64.VS2022.Pre.Open" ) ]
34+ #else
35+ // These queues do not have websockets enabled currently for full IIS
36+ [ SkipOnHelix ( "Unsupported queue" , Queues = "Windows.Amd64.VS2022.Pre.Open;Windows.Amd64.Server2022.Open" ) ]
37+ #endif
3338public abstract class WebSocketsTests : FunctionalTestsBase
3439{
3540 public IISTestSiteFixture Fixture { get ; }
3641
3742 public WebSocketsTests ( IISTestSiteFixture fixture , ITestOutputHelper testOutput ) : base ( testOutput )
3843 {
3944 Fixture = fixture ;
40- Fixture . DeploymentParameters . EnableLogging ( "C:/github/aspnetcore/artifacts/log" ) ;
4145 }
4246
4347 [ ConditionalFact ]
You can’t perform that action at this time.
0 commit comments