From 2c99a46d56d0d1032957e53a425a0c437c0c32d5 Mon Sep 17 00:00:00 2001 From: DivyaMohan Date: Fri, 16 Sep 2022 15:22:15 -0700 Subject: [PATCH 1/2] test: refactor to async/await --- test/sequential/test-debugger-exec.js | 123 +++++++++++--------------- 1 file changed, 54 insertions(+), 69 deletions(-) diff --git a/test/sequential/test-debugger-exec.js b/test/sequential/test-debugger-exec.js index 4057dd03785e7c..ce98dddfff94e0 100644 --- a/test/sequential/test-debugger-exec.js +++ b/test/sequential/test-debugger-exec.js @@ -8,76 +8,61 @@ const startCLI = require('../common/debugger'); const assert = require('assert'); -{ +const cli = startCLI([fixtures.path('debugger/alive.js')]); - const cli = startCLI([fixtures.path('debugger/alive.js')]); +var waitInitialBreak = async function () { + try { + await cli.waitForInitialBreak(); + await cli.waitForPrompt(); + await cli.command('exec [typeof heartbeat, typeof process.exit]'); + assert.match(cli.output, /\[ 'function', 'function' \]/, 'works w/o paren'); - function onFatal(error) { - cli.quit(); - throw error; + await cli.command('p [typeof heartbeat, typeof process.exit]'); + assert.match( + cli.output, + /\[ 'function', 'function' \]/, + 'works w/o paren, short' + ); + + await cli.command('repl'); + assert.match( + cli.output, + /Press Ctrl\+C to leave debug repl\n+> /, + 'shows hint for how to leave repl' + ); + assert.doesNotMatch(cli.output, /debug>/, 'changes the repl style'); + + await cli.command('[typeof heartbeat, typeof process.exit]'); + await cli.waitFor(/function/); + await cli.waitForPrompt(); + assert.match( + cli.output, + /\[ 'function', 'function' \]/, + 'can evaluate in the repl' + ); + assert.match(cli.output, /> $/); + + await cli.ctrlC(); + await cli.waitFor(/debug> $/); + await cli.command('exec("[typeof heartbeat, typeof process.exit]")'); + assert.match(cli.output, /\[ 'function', 'function' \]/, 'works w/ paren'); + await cli.command('p("[typeof heartbeat, typeof process.exit]")'); + assert.match( + cli.output, + /\[ 'function', 'function' \]/, + 'works w/ paren, short' + ); + + await cli.command('cont'); + await cli.command('exec [typeof heartbeat, typeof process.exit]'); + assert.match( + cli.output, + /\[ 'undefined', 'function' \]/, + 'non-paused exec can see global but not module-scope values' + ); + } finally { + await cli.quit(); } +}; - cli.waitForInitialBreak() - .then(() => cli.waitForPrompt()) - .then(() => cli.command('exec [typeof heartbeat, typeof process.exit]')) - .then(() => { - assert.match( - cli.output, - /\[ 'function', 'function' \]/, - 'works w/o paren' - ); - }) - .then(() => cli.command('p [typeof heartbeat, typeof process.exit]')) - .then(() => { - assert.match( - cli.output, - /\[ 'function', 'function' \]/, - 'works w/o paren, short' - ); - }) - .then(() => cli.command('repl')) - .then(() => { - assert.match( - cli.output, - /Press Ctrl\+C to leave debug repl\n+> /, - 'shows hint for how to leave repl'); - assert.doesNotMatch(cli.output, /debug>/, 'changes the repl style'); - }) - .then(() => cli.command('[typeof heartbeat, typeof process.exit]')) - .then(() => cli.waitFor(/function/)) - .then(() => cli.waitForPrompt()) - .then(() => { - assert.match( - cli.output, - /\[ 'function', 'function' \]/, 'can evaluate in the repl'); - assert.match(cli.output, /> $/); - }) - .then(() => cli.ctrlC()) - .then(() => cli.waitFor(/debug> $/)) - .then(() => cli.command('exec("[typeof heartbeat, typeof process.exit]")')) - .then(() => { - assert.match( - cli.output, - /\[ 'function', 'function' \]/, - 'works w/ paren' - ); - }) - .then(() => cli.command('p("[typeof heartbeat, typeof process.exit]")')) - .then(() => { - assert.match( - cli.output, - /\[ 'function', 'function' \]/, - 'works w/ paren, short' - ); - }) - .then(() => cli.command('cont')) - .then(() => cli.command('exec [typeof heartbeat, typeof process.exit]')) - .then(() => { - assert.match( - cli.output, - /\[ 'undefined', 'function' \]/, - 'non-paused exec can see global but not module-scope values'); - }) - .then(() => cli.quit()) - .then(null, onFatal); -} +return waitInitialBreak(); From 8ce897ac100ac73374000fa5d50098fca4b985aa Mon Sep 17 00:00:00 2001 From: DivyaMohan Date: Sun, 18 Sep 2022 19:53:30 -0700 Subject: [PATCH 2/2] test: refactor to async/await --- test/sequential/test-debugger-exec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/sequential/test-debugger-exec.js b/test/sequential/test-debugger-exec.js index ce98dddfff94e0..3d4bb9ff63ab91 100644 --- a/test/sequential/test-debugger-exec.js +++ b/test/sequential/test-debugger-exec.js @@ -10,7 +10,7 @@ const assert = require('assert'); const cli = startCLI([fixtures.path('debugger/alive.js')]); -var waitInitialBreak = async function () { +async function waitInitialBreak() { try { await cli.waitForInitialBreak(); await cli.waitForPrompt(); @@ -63,6 +63,6 @@ var waitInitialBreak = async function () { } finally { await cli.quit(); } -}; +} -return waitInitialBreak(); +waitInitialBreak();