test: make sure that inspector tests finish

addaleax · targos · commit 756a049a1a68 · 2020-04-11T10:12:58.000+02:00
PR-URL: #32673 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/test/parallel/test-inspector-bindings.js b/test/parallel/test-inspector-bindings.js
@@ -127,4 +127,4 @@ async function doTests() {
   await testNoCrashConsoleLogBeforeThrow();
 }
 
-doTests();
+doTests().then(common.mustCall());
diff --git a/test/parallel/test-inspector-esm.js b/test/parallel/test-inspector-esm.js
@@ -109,4 +109,4 @@ async function runTest() {
   assert.strictEqual((await child.expectShutdown()).exitCode, 55);
 }
 
-runTest();
+runTest().then(common.mustCall());
diff --git a/test/parallel/test-inspector-multisession-js.js b/test/parallel/test-inspector-multisession-js.js
@@ -57,7 +57,7 @@ async function test() {
 }
 
 const interval = setInterval(() => {}, 1000);
-test().then(() => {
+test().then(common.mustCall(() => {
   clearInterval(interval);
   console.log('Done!');
-});
+}));
diff --git a/test/parallel/test-inspector-multisession-ws.js b/test/parallel/test-inspector-multisession-ws.js
@@ -74,4 +74,4 @@ async function runTest() {
   return child.expectShutdown();
 }
 
-runTest();
+runTest().then(common.mustCall());
diff --git a/test/parallel/test-inspector-reported-host.js b/test/parallel/test-inspector-reported-host.js
@@ -16,4 +16,4 @@ async function test() {
   child.kill();
 }
 
-test();
+test().then(common.mustCall());
diff --git a/test/parallel/test-inspector-tracing-domain.js b/test/parallel/test-inspector-tracing-domain.js
@@ -66,4 +66,4 @@ async function test() {
   console.log('Success');
 }
 
-test();
+test().then(common.mustCall());
diff --git a/test/parallel/test-inspector-wait-for-connection.js b/test/parallel/test-inspector-wait-for-connection.js
@@ -58,4 +58,4 @@ async function runTests() {
   assert.throws(() => require('inspector').waitForDebugger(), re);
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/parallel/test-inspector-waiting-for-disconnect.js b/test/parallel/test-inspector-waiting-for-disconnect.js
@@ -41,4 +41,4 @@ async function runTest() {
   assert.strictEqual((await child.expectShutdown()).exitCode, 55);
 }
 
-runTest();
+runTest().then(common.mustCall());
diff --git a/test/sequential/test-inspector-async-hook-setup-at-inspect-brk.js b/test/sequential/test-inspector-async-hook-setup-at-inspect-brk.js
@@ -46,4 +46,4 @@ async function runTests() {
   assert.strictEqual((await instance.expectShutdown()).exitCode, 55);
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-async-hook-setup-at-signal.js b/test/sequential/test-inspector-async-hook-setup-at-signal.js
@@ -81,4 +81,4 @@ async function runTests() {
   instance.kill();
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-async-stack-traces-promise-then.js b/test/sequential/test-inspector-async-stack-traces-promise-then.js
@@ -68,4 +68,4 @@ function assertArrayIncludes(actual, expected) {
     `Expected ${actualString} to contain ${expectedString}.`);
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-async-stack-traces-set-interval.js b/test/sequential/test-inspector-async-stack-traces-set-interval.js
@@ -44,4 +44,4 @@ async function runTests() {
   instance.kill();
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-break-e.js b/test/sequential/test-inspector-break-e.js
@@ -18,4 +18,4 @@ async function runTests() {
   assert.strictEqual((await instance.expectShutdown()).exitCode, 0);
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-break-when-eval.js b/test/sequential/test-inspector-break-when-eval.js
@@ -75,4 +75,4 @@ async function runTests() {
   assert.strictEqual((await child.expectShutdown()).exitCode, 0);
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-console.js b/test/sequential/test-inspector-console.js
@@ -34,4 +34,4 @@ async function runTest() {
   session.disconnect();
 }
 
-runTest();
+runTest().then(common.mustCall());
diff --git a/test/sequential/test-inspector-contexts.js b/test/sequential/test-inspector-contexts.js
@@ -163,4 +163,7 @@ async function testBreakpointHit() {
   await pausedPromise;
 }
 
-testContextCreatedAndDestroyed().then(common.mustCall(testBreakpointHit));
+(async function() {
+  await testContextCreatedAndDestroyed();
+  await testBreakpointHit();
+})().then(common.mustCall());
diff --git a/test/sequential/test-inspector-debug-brk-flag.js b/test/sequential/test-inspector-debug-brk-flag.js
@@ -27,7 +27,7 @@ async function testBreakpointOnStart(session) {
 }
 
 async function runTests() {
-  const child = new NodeInstance(['--inspect', '--debug-brk']);
+  const child = new NodeInstance(['--inspect', '--inspect-brk']);
   const session = await child.connectInspectorSession();
 
   await testBreakpointOnStart(session);
@@ -36,4 +36,4 @@ async function runTests() {
   assert.strictEqual((await child.expectShutdown()).exitCode, 55);
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-debug-end.js b/test/sequential/test-inspector-debug-end.js
@@ -41,4 +41,4 @@ async function runTest() {
   await testSessionNoCrash();
 }
 
-runTest();
+runTest().then(common.mustCall());
diff --git a/test/sequential/test-inspector-exception.js b/test/sequential/test-inspector-exception.js
@@ -41,4 +41,4 @@ async function runTest() {
   assert.strictEqual((await child.expectShutdown()).exitCode, 1);
 }
 
-runTest();
+runTest().then(common.mustCall());
diff --git a/test/sequential/test-inspector-ip-detection.js b/test/sequential/test-inspector-ip-detection.js
@@ -43,4 +43,4 @@ async function test() {
   instance.kill();
 }
 
-test();
+test().then(common.mustCall());
diff --git a/test/sequential/test-inspector-not-blocked-on-idle.js b/test/sequential/test-inspector-not-blocked-on-idle.js
@@ -17,4 +17,4 @@ async function runTests() {
   node.kill();
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-overwrite-config.js b/test/sequential/test-inspector-overwrite-config.js
@@ -41,4 +41,4 @@ async function runTests() {
   assert.ok(asserted, 'log statement did not reach the inspector');
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-resource-name-to-url.js b/test/sequential/test-inspector-resource-name-to-url.js
@@ -37,4 +37,4 @@ common.skipIfInspectorDisabled();
     const { params: { url } } = await promise;
     strictEqual(url, expected);
   }
-})();
+})().then(common.mustCall());
diff --git a/test/sequential/test-inspector-runtime-evaluate-with-timeout.js b/test/sequential/test-inspector-runtime-evaluate-with-timeout.js
@@ -22,4 +22,4 @@ common.skipIfInspectorDisabled();
     }
   );
   session.disconnect();
-})();
+})().then(common.mustCall());
diff --git a/test/sequential/test-inspector-scriptparsed-context.js b/test/sequential/test-inspector-scriptparsed-context.js
@@ -83,4 +83,4 @@ async function runTests() {
   assert.strictEqual((await instance.expectShutdown()).exitCode, 0);
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-stop-profile-after-done.js b/test/sequential/test-inspector-stop-profile-after-done.js
@@ -27,4 +27,4 @@ async function runTests() {
   assert.strictEqual((await child.expectShutdown()).exitCode, 0);
 }
 
-runTests();
+runTests().then(common.mustCall());
diff --git a/test/sequential/test-inspector-stress-http.js b/test/sequential/test-inspector-stress-http.js
@@ -28,4 +28,4 @@ async function runTest() {
   return child.kill();
 }
 
-runTest();
+runTest().then(common.mustCall());
diff --git a/test/sequential/test-inspector.js b/test/sequential/test-inspector.js
@@ -314,4 +314,4 @@ async function runTest() {
   );
 }
 
-runTest();
+runTest().then(common.mustCall());

Original file line number	Diff line number	Diff line change
`@@ -127,4 +127,4 @@ async function doTests() {`
`127`	`127`	`await testNoCrashConsoleLogBeforeThrow();`
`128`	`128`	`}`
`129`	`129`
`130`		`-doTests();`
	`130`	`+doTests().then(common.mustCall());`
Original file line number	Diff line number	Diff line change
`@@ -109,4 +109,4 @@ async function runTest() {`
`109`	`109`	`assert.strictEqual((await child.expectShutdown()).exitCode, 55);`
`110`	`110`	`}`
`111`	`111`
`112`		`-runTest();`
	`112`	`+runTest().then(common.mustCall());`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ async function test() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`const interval = setInterval(() => {}, 1000);`
`60`		`-test().then(() => {`
	`60`	`+test().then(common.mustCall(() => {`
`61`	`61`	`clearInterval(interval);`
`62`	`62`	`console.log('Done!');`
`63`		`-});`
	`63`	`+}));`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,4 @@ async function runTest() {`
`74`	`74`	`return child.expectShutdown();`
`75`	`75`	`}`
`76`	`76`
`77`		`-runTest();`
	`77`	`+runTest().then(common.mustCall());`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ async function test() {`
`16`	`16`	`child.kill();`
`17`	`17`	`}`
`18`	`18`
`19`		`-test();`
	`19`	`+test().then(common.mustCall());`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,4 @@ async function test() {`
`66`	`66`	`console.log('Success');`
`67`	`67`	`}`
`68`	`68`
`69`		`-test();`
	`69`	`+test().then(common.mustCall());`
Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,4 @@ async function runTests() {`
`58`	`58`	`assert.throws(() => require('inspector').waitForDebugger(), re);`
`59`	`59`	`}`
`60`	`60`
`61`		`-runTests();`
	`61`	`+runTests().then(common.mustCall());`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,4 @@ async function runTest() {`
`41`	`41`	`assert.strictEqual((await child.expectShutdown()).exitCode, 55);`
`42`	`42`	`}`
`43`	`43`
`44`		`-runTest();`
	`44`	`+runTest().then(common.mustCall());`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,4 @@ async function runTests() {`
`46`	`46`	`assert.strictEqual((await instance.expectShutdown()).exitCode, 55);`
`47`	`47`	`}`
`48`	`48`
`49`		`-runTests();`
	`49`	`+runTests().then(common.mustCall());`
Original file line number	Diff line number	Diff line change
`@@ -81,4 +81,4 @@ async function runTests() {`
`81`	`81`	`instance.kill();`
`82`	`82`	`}`
`83`	`83`
`84`		`-runTests();`
	`84`	`+runTests().then(common.mustCall());`