[wasm][debugger] Debug CI (#83266)

Increase timeout wait until the runtime is ready when receive dotnet.runtests command.
dotnet · Mar 16, 2023 · 8560ea9 · 8560ea9
1 parent 7a3b4f6
commit 8560ea9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
@@ -639,8 +639,9 @@ protected override async Task<bool> AcceptCommand(MessageId id, JObject parms, C
                 case "DotnetDebugger.runTests":
                     {
                         SendResponse(id, Result.OkFromObject(new { }), token);
-                        if (await IsRuntimeAlreadyReadyAlready(id, token))
-                            await RuntimeReady(id, token);
+                        while (!await IsRuntimeAlreadyReadyAlready(id, token)) //retry on debugger-tests until the runtime is ready
+                            await Task.Delay(1000, token);
+                        await RuntimeReady(id, token);
                         return true;
                     }
             }

diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/InspectorClient.cs b/src/mono/wasm/debugger/DebuggerTestSuite/InspectorClient.cs
@@ -81,7 +81,7 @@ public Task<Result> SendCommand(string method, JObject args, CancellationToken t
 
         public virtual Task<Result> SendCommand(SessionId sessionId, string method, JObject args, CancellationToken token)
         {
-            int id = ++next_cmd_id;
+            int id = Interlocked.Increment(ref next_cmd_id);
             if (args == null)
                 args = new JObject();
 

diff --git a/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets b/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets
@@ -3,8 +3,8 @@
     <NeedsToRunOnBrowser>true</NeedsToRunOnBrowser>
     <WorkItemPrefix>$(DebuggerHost)-</WorkItemPrefix>
     <UseDotNetCliVersionFromGlobalJson>true</UseDotNetCliVersionFromGlobalJson>
-    <_DebuggerTestsWorkItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests'">00:30:00</_DebuggerTestsWorkItemTimeout>
-    <_DebuggerTestsWorkItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests' and '$(BrowserHost)' == 'windows'">00:40:00</_DebuggerTestsWorkItemTimeout>
+    <_DebuggerTestsWorkItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests'">00:50:00</_DebuggerTestsWorkItemTimeout>
+    <_DebuggerTestsWorkItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests' and '$(BrowserHost)' == 'windows'">00:50:00</_DebuggerTestsWorkItemTimeout>
 
     <HelixExtensionTargets>$(HelixExtensionTargets);_AddWorkItemsForWasmDebuggerTests</HelixExtensionTargets>
   </PropertyGroup>