File tree 2 files changed +11
-3
lines changed
src/Servers/IIS/IIS/test/Common.FunctionalTests
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)
50
50
// Uncomment to add IIS debug logs to test output.
51
51
//DeploymentParameters.EnvironmentVariables.Add("ASPNETCORE_MODULE_DEBUG", "console");
52
52
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
+ }
54
58
}
55
59
56
60
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;
29
29
#endif
30
30
31
31
[ 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
33
38
public abstract class WebSocketsTests : FunctionalTestsBase
34
39
{
35
40
public IISTestSiteFixture Fixture { get ; }
36
41
37
42
public WebSocketsTests ( IISTestSiteFixture fixture , ITestOutputHelper testOutput ) : base ( testOutput )
38
43
{
39
44
Fixture = fixture ;
40
- Fixture . DeploymentParameters . EnableLogging ( "C:/github/aspnetcore/artifacts/log" ) ;
41
45
}
42
46
43
47
[ ConditionalFact ]
You can’t perform that action at this time.
0 commit comments