From a0643b6788b6bf62055909dc73fab1683795b249 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Fri, 18 Oct 2024 08:49:37 +0000
Subject: [PATCH 1/5] Throw with short and easily cought message in debugger
 tests.

---
 .../debugger/DebuggerTestSuite/DebuggerTestBase.cs       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
index 827353af598e33..ac88b705bf75da 100644
--- a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
+++ b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
@@ -285,7 +285,14 @@ internal virtual JObject CreateEvaluateArgs(string expression)
 
         internal virtual async Task<JObject> WaitFor(string what)
         {
-            return await insp.WaitFor(what);
+            try
+            {
+                return await insp.WaitFor(what);
+            }
+            catch
+            {
+                new Exception($"Waiting for {what} failed");
+            }
         }
         public async Task WaitForConsoleMessage(string message)
         {

From d41445cb22f865aa8930e4cc0a51a6e18956b40f Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Fri, 18 Oct 2024 08:54:41 +0000
Subject: [PATCH 2/5] A bit longer message.

---
 src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
index ac88b705bf75da..9ba5fc4cc50873 100644
--- a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
+++ b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
@@ -291,7 +291,7 @@ internal virtual async Task<JObject> WaitFor(string what)
             }
             catch
             {
-                new Exception($"Waiting for {what} failed");
+                new Exception($"Debugger inspector waiting for {what} failed");
             }
         }
         public async Task WaitForConsoleMessage(string message)

From b62e9c2d6f0f1501eed363be24476dc96b21e88b Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Fri, 18 Oct 2024 11:07:58 +0200
Subject: [PATCH 3/5] Update
 src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marek Fišera <mara@neptuo.com>
---
 src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
index 9ba5fc4cc50873..ab974d0a7b1978 100644
--- a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
+++ b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
@@ -291,7 +291,7 @@ internal virtual async Task<JObject> WaitFor(string what)
             }
             catch
             {
-                new Exception($"Debugger inspector waiting for {what} failed");
+                throw new Exception($"Debugger inspector waiting for {what} failed");
             }
         }
         public async Task WaitForConsoleMessage(string message)

From 780f6627272925989856c7d16b4260a82c6c8441 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:29:21 +0000
Subject: [PATCH 4/5] Timeout when we're waiting longer than 10 sec.

---
 .../debugger/DebuggerTestSuite/DebuggerTestBase.cs     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
index ab974d0a7b1978..d9a511ef26a9d0 100644
--- a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
+++ b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
@@ -287,13 +287,21 @@ internal virtual async Task<JObject> WaitFor(string what)
         {
             try
             {
-                return await insp.WaitFor(what);
+                var timeout = Task.Delay(10000);
+                var waitForTask = insp.WaitFor(what);
+                var completedTask = await Task.WhenAny(waitForTask, timeout);
+                if (completedTask == timeout)
+                {
+                    throw new TimeoutException($"Debugger inspector waiting for {what} timed out after 10 seconds");
+                }
+                return await completedTask;
             }
             catch
             {
                 throw new Exception($"Debugger inspector waiting for {what} failed");
             }
         }
+
         public async Task WaitForConsoleMessage(string message)
         {
             object llock = new();

From 8a29e8e03f9c633b0f2037d6e3d527ebe83cda74 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Fri, 18 Oct 2024 17:23:52 +0000
Subject: [PATCH 5/5] Build errror

---
 src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
index d9a511ef26a9d0..4a3b8c24a36837 100644
--- a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
+++ b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
@@ -294,7 +294,7 @@ internal virtual async Task<JObject> WaitFor(string what)
                 {
                     throw new TimeoutException($"Debugger inspector waiting for {what} timed out after 10 seconds");
                 }
-                return await completedTask;
+                return await waitForTask;
             }
             catch
             {