From 4f17dc704f8ac19acdc7053d5676942987abb643 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Wed, 29 Mar 2023 14:04:39 -0300 Subject: [PATCH 01/17] Adding --disable-software-rasterizer as suggested by @lewing --- src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs b/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs index 7d95f72e675185..01c1c7119bcd6c 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs @@ -173,6 +173,11 @@ private static string GetInitParms(int port, string lang="en-US") Console.WriteLine ("Detected a container, disabling sandboxing for debugger tests."); str = "--no-sandbox " + str; } + if (Environment.GetEnvironmentVariable("SKIP_LOG_TO_CONSOLE") == "1") + { + Console.WriteLine ("Detected CI, disabling software rasterizer for debugger tests."); + str = "--disable-software-rasterizer " + str; + } return str; } } From c00bac22407392fed3fa21d30a753b0181c31571 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Wed, 29 Mar 2023 20:39:32 -0300 Subject: [PATCH 02/17] Trying to add --no-sandbox also when CI is detected --- src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs b/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs index 01c1c7119bcd6c..09e4cd73951a26 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs @@ -173,10 +173,10 @@ private static string GetInitParms(int port, string lang="en-US") Console.WriteLine ("Detected a container, disabling sandboxing for debugger tests."); str = "--no-sandbox " + str; } - if (Environment.GetEnvironmentVariable("SKIP_LOG_TO_CONSOLE") == "1") + else if (Environment.GetEnvironmentVariable("SKIP_LOG_TO_CONSOLE") == "1") { Console.WriteLine ("Detected CI, disabling software rasterizer for debugger tests."); - str = "--disable-software-rasterizer " + str; + str = "--no-sandbox " + str; } return str; } From a37daf6a6032f9799ee56f42298fbce8967b4916 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Wed, 29 Mar 2023 23:36:44 -0300 Subject: [PATCH 03/17] TRying to automatically retry if a test timeout. --- .../DebuggerTestSuite/BadHarnessInitTests.cs | 2 +- .../DebuggerTestSuite/DebuggerTestBase.cs | 2 +- .../DebuggerTestSuite/DebuggerTestFirefox.cs | 2 +- .../debugger/DebuggerTestSuite/Inspector.cs | 20 ++++++++++++++++--- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/BadHarnessInitTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/BadHarnessInitTests.cs index c0450fd053162f..a88aff6af4ed19 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/BadHarnessInitTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/BadHarnessInitTests.cs @@ -34,7 +34,7 @@ public async Task InvalidInitCommands() await Ready(); - var ae = await Assert.ThrowsAsync(async () => await insp.OpenSessionAsync(fn, TestTimeout)); + var ae = await Assert.ThrowsAsync(async () => await insp.OpenSessionAsync(fn, "", TestTimeout)); Assert.Contains(bad_cmd_name, ae.Message); } } diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 225fcabff37f6c..7e82ee199bd95b 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -164,7 +164,7 @@ public virtual async Task InitializeAsync() }; await Ready(); - await insp.OpenSessionAsync(fn, TestTimeout); + await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); } public virtual async Task DisposeAsync() diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestFirefox.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestFirefox.cs index 282ecbf9a56645..2bee9106c8cdbe 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestFirefox.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestFirefox.cs @@ -39,7 +39,7 @@ public override async Task InitializeAsync() }; await Ready(); - await insp.OpenSessionAsync(fn, TestTimeout); + await insp.OpenSessionAsync(fn, "", TestTimeout); } internal override Dictionary SubscribeToScripts(Inspector insp) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs index 3dafd0df037cc5..dd4850f6345012 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs @@ -351,13 +351,22 @@ public async Task LaunchBrowser(DateTime start, TimeSpan span) }); } - public async Task OpenSessionAsync(Func)>> getInitCmds, TimeSpan span) + public async Task OpenSessionAsync(Func)>> getInitCmds, string urlToInspect, TimeSpan span) { + int retry = 0; var start = DateTime.Now; try { await LaunchBrowser(start, span); - +Retry: + if (_isFailingWithException is not null && retry == 0) + { + _isFailingWithException = null; + _cancellationTokenSource = new CancellationTokenSource(); + Token = _cancellationTokenSource.Token; + retry++; + await Client.SendCommand("Page.navigate", JObject.FromObject(new { url = urlToInspect }), _cancellationTokenSource.Token); + } var init_cmds = getInitCmds(Client, _cancellationTokenSource.Token); Task readyTask = Task.Run(async () => Result.FromJson(await WaitFor(APP_READY))); @@ -373,7 +382,12 @@ public async Task OpenSessionAsync(Func Date: Thu, 30 Mar 2023 00:03:07 -0300 Subject: [PATCH 04/17] fix compilation error --- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 5 +++-- src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 7e82ee199bd95b..699d59e0629120 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -65,7 +65,7 @@ public static WasmHost RunningOn static int s_idCounter = -1; public int Id { get; init; } - + public string driver; public static string DebuggerTestAppPath { get @@ -130,7 +130,7 @@ static DebuggerTestBase() Directory.Delete(TempPath, recursive: true); } - public DebuggerTestBase(ITestOutputHelper testOutput, string locale, string driver = "debugger-driver.html") + public DebuggerTestBase(ITestOutputHelper testOutput, string locale, string _driver = "debugger-driver.html") { _env = new TestEnvironment(testOutput); _testOutput = testOutput; @@ -141,6 +141,7 @@ public DebuggerTestBase(ITestOutputHelper testOutput, string locale, string driv insp = new Inspector(Id, _testOutput); cli = insp.Client; + driver = _driver; scripts = SubscribeToScripts(insp); startTask = TestHarnessProxy.Start(DebuggerTestAppPath, driver, UrlToRemoteDebugging(), testOutput, locale); } diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs index dd4850f6345012..f8b6238ecd7ded 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs @@ -29,7 +29,7 @@ class Inspector ConcurrentQueue<(string, JObject)> nextNotifications = new (); //in a multithreaded runtime we can receive more than one pause at same time public const string PAUSE = "pause"; public const string APP_READY = "app-ready"; - public CancellationToken Token { get; } + public CancellationToken Token { get; set; } public InspectorClient Client { get; } public DebuggerProxyBase? Proxy { get; } public bool DetectAndFailOnAssertions { get; set; } = true; From 0559358293eebab83554cb91cf594eee68e5a284 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Thu, 30 Mar 2023 12:40:38 -0300 Subject: [PATCH 05/17] Try another fix --- .../DebuggerTestSuite/ChromeProvider.cs | 4 ++-- .../debugger/DebuggerTestSuite/Inspector.cs | 20 +++++-------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs b/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs index 09e4cd73951a26..072293e33e6288 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs @@ -56,7 +56,7 @@ public async Task StartBrowserAndProxyAsync(HttpContext context, // for WIndows setting --lang arg is enough if (!OperatingSystem.IsWindows()) Environment.SetEnvironmentVariable("LANGUAGE", locale); - ProcessStartInfo psi = GetProcessStartInfo(s_browserPath.Value, GetInitParms(remoteDebuggingPort, locale), targetUrl); + ProcessStartInfo psi = GetProcessStartInfo(s_browserPath.Value, GetInitParms(remoteDebuggingPort, locale), "about:blank"); line = await LaunchHostAsync( psi, context, @@ -175,7 +175,7 @@ private static string GetInitParms(int port, string lang="en-US") } else if (Environment.GetEnvironmentVariable("SKIP_LOG_TO_CONSOLE") == "1") { - Console.WriteLine ("Detected CI, disabling software rasterizer for debugger tests."); + Console.WriteLine ("Detected CI, disabling sandboxing for debugger tests."); str = "--no-sandbox " + str; } return str; diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs index f8b6238ecd7ded..d7e31121a5f083 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs @@ -358,15 +358,6 @@ public async Task OpenSessionAsync(Func readyTask = Task.Run(async () => Result.FromJson(await WaitFor(APP_READY))); @@ -382,12 +373,7 @@ public async Task OpenSessionAsync(Func Date: Thu, 30 Mar 2023 13:07:50 -0300 Subject: [PATCH 06/17] Fix compilation --- src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs index d7e31121a5f083..1d5bae58423cec 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs @@ -353,7 +353,6 @@ public async Task LaunchBrowser(DateTime start, TimeSpan span) public async Task OpenSessionAsync(Func)>> getInitCmds, string urlToInspect, TimeSpan span) { - int retry = 0; var start = DateTime.Now; try { From bdcd4d3d206846303a10674c88f3cc553da90d0e Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Thu, 30 Mar 2023 14:43:53 -0300 Subject: [PATCH 07/17] retrying if timeout OpenSessionAsync. --- .../wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 699d59e0629120..458efd1da30b76 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -165,7 +165,14 @@ public virtual async Task InitializeAsync() }; await Ready(); - await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); + try { + await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); + } + catch (TaskCanceledException) //if timed out for some reason let's try again + { + _logger.LogInformation("Let's retry"); + await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); + } } public virtual async Task DisposeAsync() From 9562f317dc7fbdea8bccfb4ed9fc17f0981dc1dc Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Thu, 30 Mar 2023 14:45:13 -0300 Subject: [PATCH 08/17] Adding more log --- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 458efd1da30b76..56525644033869 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -168,9 +168,9 @@ public virtual async Task InitializeAsync() try { await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); } - catch (TaskCanceledException) //if timed out for some reason let's try again + catch (TaskCanceledException exc) //if timed out for some reason let's try again { - _logger.LogInformation("Let's retry"); + _testOutput.WriteLine($"Let's retry: {exc.ToString()}"); await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); } } From c6a0cbff043a616d89e2ad60e0032175d00e899a Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Thu, 30 Mar 2023 18:14:39 -0300 Subject: [PATCH 09/17] Fix retry --- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 56525644033869..525ad49d2bc893 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -171,6 +171,10 @@ public virtual async Task InitializeAsync() catch (TaskCanceledException exc) //if timed out for some reason let's try again { _testOutput.WriteLine($"Let's retry: {exc.ToString()}"); + insp = new Inspector(Id, _testOutput); + cli = insp.Client; + driver = _driver; + scripts = SubscribeToScripts(insp); await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); } } From 306d87f202caacfb368dc4bdcc974e486ded4a6f Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Thu, 30 Mar 2023 19:38:50 -0300 Subject: [PATCH 10/17] Fix compilation --- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 525ad49d2bc893..7d6bb9ff482f08 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -173,7 +173,6 @@ public virtual async Task InitializeAsync() _testOutput.WriteLine($"Let's retry: {exc.ToString()}"); insp = new Inspector(Id, _testOutput); cli = insp.Client; - driver = _driver; scripts = SubscribeToScripts(insp); await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); } From f2e9abbde4462a1093e40f37677d41d5f6539fd6 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Fri, 31 Mar 2023 10:19:49 -0300 Subject: [PATCH 11/17] Create another id for the retry --- .../wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 7d6bb9ff482f08..23d694b5c0dd55 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -148,6 +148,7 @@ public DebuggerTestBase(ITestOutputHelper testOutput, string locale, string _dri public virtual async Task InitializeAsync() { + bool retry = true; Func)>> fn = (client, token) => { Func)> getInitCmdFn = (cmd, args) => (cmd, client.SendCommand(cmd, args, token)); @@ -170,8 +171,11 @@ public virtual async Task InitializeAsync() } catch (TaskCanceledException exc) //if timed out for some reason let's try again { + if (!retry) + throw exc; + retry = false; _testOutput.WriteLine($"Let's retry: {exc.ToString()}"); - insp = new Inspector(Id, _testOutput); + insp = new Inspector(Id + "_retry", _testOutput); cli = insp.Client; scripts = SubscribeToScripts(insp); await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); From fa0e32e89a9d0e5acc82e6dbb655dfd45ddaa355 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Fri, 31 Mar 2023 10:21:15 -0300 Subject: [PATCH 12/17] Fix compilation --- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 23d694b5c0dd55..854f21eccd5884 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -175,7 +175,8 @@ public virtual async Task InitializeAsync() throw exc; retry = false; _testOutput.WriteLine($"Let's retry: {exc.ToString()}"); - insp = new Inspector(Id + "_retry", _testOutput); + Id = Interlocked.Increment(ref s_idCounter); + insp = new Inspector(Id, _testOutput); cli = insp.Client; scripts = SubscribeToScripts(insp); await insp.OpenSessionAsync(fn, $"http://{TestHarnessProxy.Endpoint.Authority}/{driver}", TestTimeout); From f71231883b2e1f95694be77d44f9fbe4149f69d2 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Fri, 31 Mar 2023 10:21:43 -0300 Subject: [PATCH 13/17] Another fix. --- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 854f21eccd5884..c73783e7550964 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -64,7 +64,7 @@ public static WasmHost RunningOn static string s_debuggerTestAppPath; static int s_idCounter = -1; - public int Id { get; init; } + public int Id { get; init; set; } public string driver; public static string DebuggerTestAppPath { From ca98402e090c3591681b82017b15675432e04b12 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Fri, 31 Mar 2023 11:04:43 -0300 Subject: [PATCH 14/17] Fix compilation --- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index c73783e7550964..0d6a688f2dd446 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -64,7 +64,7 @@ public static WasmHost RunningOn static string s_debuggerTestAppPath; static int s_idCounter = -1; - public int Id { get; init; set; } + public int Id { get; set; } public string driver; public static string DebuggerTestAppPath { From 52216a0fa8d4f7e4f81b36a121f1fac71f39afb3 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Fri, 31 Mar 2023 14:41:19 -0300 Subject: [PATCH 15/17] Adding more log --- src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs index 1d5bae58423cec..8ee9d62f9a2a0e 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs @@ -372,7 +372,10 @@ public async Task OpenSessionAsync(Func Date: Mon, 3 Apr 2023 12:27:51 -0300 Subject: [PATCH 16/17] Remove unrelated change --- src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs b/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs index 072293e33e6288..49c25ca6f4fe10 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/ChromeProvider.cs @@ -173,11 +173,6 @@ private static string GetInitParms(int port, string lang="en-US") Console.WriteLine ("Detected a container, disabling sandboxing for debugger tests."); str = "--no-sandbox " + str; } - else if (Environment.GetEnvironmentVariable("SKIP_LOG_TO_CONSOLE") == "1") - { - Console.WriteLine ("Detected CI, disabling sandboxing for debugger tests."); - str = "--no-sandbox " + str; - } return str; } } From 4a623f4c15079237b6d1afed0e4eadce7b47a82d Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Wed, 5 Apr 2023 12:07:15 -0300 Subject: [PATCH 17/17] Update src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs Co-authored-by: Larry Ewing --- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index 0d6a688f2dd446..c5119a28d2ce77 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -66,6 +66,7 @@ public static WasmHost RunningOn public int Id { get; set; } public string driver; + public static string DebuggerTestAppPath { get