Skip to content

Commit 0d12412

Browse files
authored
[browser] Expanding timeouts for long running test projects (#85313)
1 parent 2deebf0 commit 0d12412

File tree

7 files changed

+34
-3
lines changed

7 files changed

+34
-3
lines changed

src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
55
<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and ('$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi')">true</DebuggerSupport>
66
</PropertyGroup>
7+
8+
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
9+
<WasmXHarnessMonoArgs>--setenv=XHARNESS_LOG_TEST_START=true --no-memory-snapshot</WasmXHarnessMonoArgs>
10+
<!-- This WASM test is problematic and slow right now. This sets the xharness timeout but there is also override in sendtohelix-wasm.targets -->
11+
<WasmXHarnessTestsTimeout>01:15:00</WasmXHarnessTestsTimeout>
12+
</PropertyGroup>
13+
714
<ItemGroup>
815
<RdXmlFile Include="default.rd.xml" />
916
</ItemGroup>

src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<TestArchiveTestsRoot>$(TestArchiveRoot)browserornodejs/</TestArchiveTestsRoot>
2626
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
2727
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
28+
<WasmXHarnessMonoArgs>--setenv=XHARNESS_LOG_TEST_START=true --no-memory-snapshot</WasmXHarnessMonoArgs>
29+
<!-- This WASM test is problematic and slow right now. This sets the xharness timeout but there is also override in sendtohelix-wasm.targets -->
30+
<WasmXHarnessTestsTimeout>01:15:00</WasmXHarnessTestsTimeout>
2831
</PropertyGroup>
2932

3033
<ItemGroup>

src/libraries/System.Net.WebSockets.Client/tests/CloseTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ await Assert.ThrowsAnyAsync<WebSocketException>(async () =>
224224

225225
[OuterLoop("Uses external servers", typeof(PlatformDetection), nameof(PlatformDetection.LocalEchoServerIsNotAvailable))]
226226
[ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
227+
[ActiveIssue("https://github.com/dotnet/runtime/issues/83517", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
227228
public async Task CloseOutputAsync_ClientInitiated_CanReceive_CanClose(Uri server)
228229
{
229230
string message = "Hello WebSockets!";

src/libraries/System.Net.WebSockets.Client/tests/SendReceiveTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public async Task SendAsync_MultipleOutstandingSendOperations_Throws(Uri server)
249249
[OuterLoop("Uses external servers", typeof(PlatformDetection), nameof(PlatformDetection.LocalEchoServerIsNotAvailable))]
250250
[ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
251251
// This will also pass when no exception is thrown. Current implementation doesn't throw.
252-
[ActiveIssue("https://github.com/dotnet/runtime/issues/83517", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
252+
[ActiveIssue("https://github.com/dotnet/runtime/issues/83517", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
253253
public async Task ReceiveAsync_MultipleOutstandingReceiveOperations_Throws(Uri server)
254254
{
255255
using (ClientWebSocket cws = await GetConnectedWebSocket(server, TimeOutMilliseconds, _output))

src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
1717
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
1818
<WasmXHarnessMonoArgs>--setenv=XHARNESS_LOG_TEST_START=true --no-memory-snapshot</WasmXHarnessMonoArgs>
19-
<WasmXHarnessTestsTimeout>00:45:00</WasmXHarnessTestsTimeout>
19+
20+
<!-- This WASM test is problematic and slow right now. This sets the xharness timeout but there is also override in sendtohelix-wasm.targets -->
21+
<WasmXHarnessTestsTimeout>01:15:00</WasmXHarnessTestsTimeout>
2022
</PropertyGroup>
2123

2224
<ItemGroup>

src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'browser'">true</DebuggerSupport>
1616
<!-- Needed for JsonSerializerOptionsUpdateHandler tests -->
1717
<MetadataUpdaterSupport Condition="'$(MetadataUpdaterSupport)' == '' and '$(TargetOS)' == 'browser'">true</MetadataUpdaterSupport>
18-
<WasmXHarnessTestsTimeout>00:45:00</WasmXHarnessTestsTimeout>
1918
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
2019
</PropertyGroup>
20+
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
21+
<WasmXHarnessMonoArgs>--setenv=XHARNESS_LOG_TEST_START=true --no-memory-snapshot</WasmXHarnessMonoArgs>
22+
<!-- This WASM test is problematic and slow right now. This sets the xharness timeout but there is also override in sendtohelix-wasm.targets -->
23+
<WasmXHarnessTestsTimeout>01:15:00</WasmXHarnessTestsTimeout>
24+
</PropertyGroup>
2125
<ItemGroup Condition="'$(ContinuousIntegrationBuild)' == 'true'">
2226
<HighAotMemoryUsageAssembly Include="System.Text.Json.Tests.dll" />
2327
</ItemGroup>

src/libraries/sendtohelix-wasm.targets

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,14 @@
231231
<PayloadArchive>%(Identity)</PayloadArchive>
232232
<Command>$(HelixCommand)</Command>
233233
<Timeout>$(_workItemTimeout)</Timeout>
234+
<!--
235+
These WASM tests are problematic and slow right now, in this section it's about nodejs and chrome.
236+
Below is same section for V8. There is also Xharness timeout override in the test project.
237+
-->
238+
<Timeout Condition="'%(FileName)' == 'System.Text.Json.Tests'">01:20:00</Timeout>
239+
<Timeout Condition="'%(FileName)' == 'System.Collections.Immutable.Tests'">01:20:00</Timeout>
240+
<Timeout Condition="'%(FileName)' == 'System.Net.WebSockets.Client.Tests'">01:20:00</Timeout>
241+
<Timeout Condition="'%(FileName)' == 'System.Net.Http.Functional.Tests'">01:20:00</Timeout>
234242
</HelixWorkItem>
235243
</ItemGroup>
236244

@@ -253,7 +261,13 @@
253261
<PayloadArchive>%(Identity)</PayloadArchive>
254262
<Command>$(HelixCommand)</Command>
255263
<Timeout>$(_workItemTimeout)</Timeout>
264+
<!-- These WASM tests are problematic and slow right now, in this section it's about V8. Above is same section for nodejs and chrome -->
265+
<Timeout Condition="'%(FileName)' == 'System.Text.Json.Tests'">01:20:00</Timeout>
266+
<Timeout Condition="'%(FileName)' == 'System.Collections.Immutable.Tests'">01:20:00</Timeout>
267+
<Timeout Condition="'%(FileName)' == 'System.Net.WebSockets.Client.Tests'">01:20:00</Timeout>
268+
<Timeout Condition="'%(FileName)' == 'System.Net.Http.Functional.Tests'">01:20:00</Timeout>
256269
</HelixWorkItem>
270+
257271
</ItemGroup>
258272
</Target>
259273

0 commit comments

Comments
 (0)