From 154f9678f413b3917dda45ac28943f11cd378a2c Mon Sep 17 00:00:00 2001 From: Juliet Zhang Date: Fri, 16 Sep 2022 11:07:00 -0700 Subject: [PATCH 01/11] test: change promises to async/await in test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index f362e98068f15e..a0a60f3d55ea59 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -20,17 +20,18 @@ const path = require('path'); throw error; } - return cli.waitForInitialBreak() - .then(() => cli.waitForPrompt()) - .then(() => cli.stepCommand('c')) - .then(() => cli.command('bt')) - .then(() => { + (async function() { + try { + await cli.waitForInitialBreak(); + await cli.waitForPrompt(); + await cli.stepCommand('c'); + await cli.command('bt'); assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`)); - }) - .then(() => cli.command('backtrace')) - .then(() => { + await cli.command('backtrace'); assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`)); - }) - .then(() => cli.quit()) - .then(null, onFatal); + await cli.quit(); + } catch (error) { + return onFatal(error); + } + })(); } From cc5383541600c55b21edcf6e094e44f8b3f720de Mon Sep 17 00:00:00 2001 From: Juliet Zhang Date: Fri, 16 Sep 2022 12:53:10 -0700 Subject: [PATCH 02/11] test: change promises to async/await in test-debugger-backtrace.js fix error resulting from unused result of immediately-invoked async function --- test/sequential/test-debugger-backtrace.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index a0a60f3d55ea59..6141f661cb0107 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -20,7 +20,7 @@ const path = require('path'); throw error; } - (async function() { + async function onWaitForInitialBreak() { try { await cli.waitForInitialBreak(); await cli.waitForPrompt(); @@ -33,5 +33,7 @@ const path = require('path'); } catch (error) { return onFatal(error); } - })(); + } + + onWaitForInitialBreak(); } From 07730d769d5387bf4ca28daf419d01b53c4729da Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:45:34 -0700 Subject: [PATCH 03/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index 6141f661cb0107..8e72c3b1af398e 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -17,8 +17,7 @@ const path = require('path'); function onFatal(error) { cli.quit(); - throw error; - } +} async function onWaitForInitialBreak() { try { From 736d299f80c0137206573aff5f920d36c18ca72f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:46:53 -0700 Subject: [PATCH 04/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index 8e72c3b1af398e..b5443fff5287f8 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -29,8 +29,8 @@ const path = require('path'); await cli.command('backtrace'); assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`)); await cli.quit(); - } catch (error) { - return onFatal(error); + } finally { + await cli.quit() } } From c69af39d08fab2778b3b20a38a733bc0eef08a2a Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:47:01 -0700 Subject: [PATCH 05/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index b5443fff5287f8..4346ca9651816c 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -34,5 +34,5 @@ const path = require('path'); } } - onWaitForInitialBreak(); + runTest(); } From 1f4bbac70b3f243c72ec4014f46de2f0f32255cd Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:47:07 -0700 Subject: [PATCH 06/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index 4346ca9651816c..a5132aa689666f 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -19,7 +19,7 @@ const path = require('path'); cli.quit(); } - async function onWaitForInitialBreak() { + async function runTest() { try { await cli.waitForInitialBreak(); await cli.waitForPrompt(); From 3e766d9385674fca3bae2d8a7ff0b792e71e8f9e Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:47:35 -0700 Subject: [PATCH 07/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index a5132aa689666f..8be77e66071975 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -15,8 +15,6 @@ const path = require('path'); const script = path.relative(process.cwd(), scriptFullPath); const cli = startCLI([script]); - function onFatal(error) { - cli.quit(); } async function runTest() { From b99b0e2fdbcb0892f805653ce2ed99fc233cf0a0 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:47:55 -0700 Subject: [PATCH 08/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index 8be77e66071975..5235c9aca6aecc 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -15,8 +15,6 @@ const path = require('path'); const script = path.relative(process.cwd(), scriptFullPath); const cli = startCLI([script]); -} - async function runTest() { try { await cli.waitForInitialBreak(); From e2d54ae14e8d2b2493960ef6119319bc66d8f370 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:48:41 -0700 Subject: [PATCH 09/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index 5235c9aca6aecc..50b6e18898dacd 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -24,7 +24,6 @@ const path = require('path'); assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`)); await cli.command('backtrace'); assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`)); - await cli.quit(); } finally { await cli.quit() } From 29992861633a1817cd7388dd7ef6286d13aa17d1 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:58:52 -0700 Subject: [PATCH 10/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index 50b6e18898dacd..c0c68fa05e3b21 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -24,7 +24,7 @@ const path = require('path'); assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`)); await cli.command('backtrace'); assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`)); - } finally { + } finally { await cli.quit() } } From 3836107e23a67a29581a511163546c4a97d82d5f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 28 Sep 2022 08:59:16 -0700 Subject: [PATCH 11/11] Update test/sequential/test-debugger-backtrace.js --- test/sequential/test-debugger-backtrace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sequential/test-debugger-backtrace.js b/test/sequential/test-debugger-backtrace.js index c0c68fa05e3b21..c189cb3f5b22e6 100644 --- a/test/sequential/test-debugger-backtrace.js +++ b/test/sequential/test-debugger-backtrace.js @@ -25,7 +25,7 @@ const path = require('path'); await cli.command('backtrace'); assert.ok(cli.output.includes(`#0 topFn ${script}:7:2`)); } finally { - await cli.quit() + await cli.quit(); } }