[browser][wbt] Detect when browser gets disconnected and do not try t…

…o dispose. (dotnet#101530)
steveharter · Apr 25, 2024 · 56048b5 · 56048b5
1 parent 5e41dde
commit 56048b5
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/src/mono/wasm/Wasm.Build.Tests/BrowserRunner.cs b/src/mono/wasm/Wasm.Build.Tests/BrowserRunner.cs
@@ -109,11 +109,17 @@ public async Task<IBrowser> SpawnBrowserAsync(
         // codespaces: ignore certificate error -> Microsoft.Playwright.PlaywrightException : net::ERR_CERT_AUTHORITY_INVALID
         string[] chromeArgs = new[] { $"--explicitly-allowed-ports={url.Port}", "--ignore-certificate-errors" };
         _testOutput.WriteLine($"Launching chrome ('{s_chromePath.Value}') via playwright with args = {string.Join(',', chromeArgs)}");
-        return Browser = await Playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions{
+        Browser = await Playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions{
             ExecutablePath = s_chromePath.Value,
             Headless = headless,
             Args = chromeArgs
         });
+        Browser.Disconnected += (sender, e) =>
+        {
+            Browser = null;
+            _testOutput.WriteLine("Browser has been disconnected");
+        };
+        return Browser;
     }
 
     // FIXME: options
@@ -196,8 +202,21 @@ public async Task WaitForProcessExitAsync(TimeSpan timeout)
 
     public async ValueTask DisposeAsync()
     {
-        if (Browser is not null)
-            await Browser.DisposeAsync();
-        Playwright?.Dispose();
+        try
+        {
+            if (Browser is not null)
+            {
+                await Browser.DisposeAsync();
+                Browser = null;
+            }
+        }
+        catch (PlaywrightException ex)
+        {
+            _testOutput.WriteLine($"PlaywrightException occurred during DisposeAsync: {ex.Message}");
+        }
+        finally
+        {
+            Playwright?.Dispose();
+        }
     }
 }