test: simplify test skipping

* Make common.skip() exit.

  Also add common.printSkipMessage() for partial skips.

* Don't make needless things before skip

PR-URL: https://github.com/nodejs/node/pull/14021
Fixes: https://github.com/nodejs/node/issues/14016
Reviewed-By: Refael Ackermann <refack@gmail.com>

11 files changed, 41 insertions, 62 deletions

diff --git a/test/async-hooks/test-connection.ssl.js b/test/async-hooks/test-connection.ssl.js
index ac3e069fb8..faee0fdf08 100644
--- a/test/async-hooks/test-connection.ssl.js
+++ b/test/async-hooks/test-connection.ssl.js
@@ -1,16 +1,14 @@
 'use strict';
 
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
 const initHooks = require('./init-hooks');
 const tick = require('./tick');
-const common = require('../common');
 const assert = require('assert');
 const { checkInvocations } = require('./hook-checks');
 
-if (!common.hasCrypto) {
-  common.skip('missing crypto');
-  return;
-}
-
 const tls = require('tls');
 const Connection = process.binding('crypto').Connection;
 const hooks = initHooks();
diff --git a/test/async-hooks/test-crypto-pbkdf2.js b/test/async-hooks/test-crypto-pbkdf2.js
index 3023101f0b..2a0b44db8c 100644
--- a/test/async-hooks/test-crypto-pbkdf2.js
+++ b/test/async-hooks/test-crypto-pbkdf2.js
@@ -1,10 +1,9 @@
 'use strict';
 
 const common = require('../common');
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
+
 const assert = require('assert');
 const tick = require('./tick');
 const initHooks = require('./init-hooks');
diff --git a/test/async-hooks/test-crypto-randomBytes.js b/test/async-hooks/test-crypto-randomBytes.js
index 49ffc6fdb6..76f8f77595 100644
--- a/test/async-hooks/test-crypto-randomBytes.js
+++ b/test/async-hooks/test-crypto-randomBytes.js
@@ -1,10 +1,9 @@
 'use strict';
 
 const common = require('../common');
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
+
 const assert = require('assert');
 const tick = require('./tick');
 const initHooks = require('./init-hooks');
diff --git a/test/async-hooks/test-graph.connection.js b/test/async-hooks/test-graph.connection.js
index 37ecc79bb0..fcc764b5cc 100644
--- a/test/async-hooks/test-graph.connection.js
+++ b/test/async-hooks/test-graph.connection.js
@@ -1,13 +1,11 @@
 'use strict';
 
-const initHooks = require('./init-hooks');
 const common = require('../common');
-const verifyGraph = require('./verify-graph');
-
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
+
+const initHooks = require('./init-hooks');
+const verifyGraph = require('./verify-graph');
 
 const tls = require('tls');
 const Connection = process.binding('crypto').Connection;
diff --git a/test/async-hooks/test-graph.shutdown.js b/test/async-hooks/test-graph.shutdown.js
index 029a9c86b6..136f018212 100644
--- a/test/async-hooks/test-graph.shutdown.js
+++ b/test/async-hooks/test-graph.shutdown.js
@@ -1,14 +1,11 @@
 'use strict';
 
 const common = require('../common');
-const initHooks = require('./init-hooks');
-const verifyGraph = require('./verify-graph');
-
-if (!common.hasIPv6) {
+if (!common.hasIPv6)
   common.skip('IPv6 support required');
-  return;
-}
 
+const initHooks = require('./init-hooks');
+const verifyGraph = require('./verify-graph');
 const net = require('net');
 
 const hooks = initHooks();
diff --git a/test/async-hooks/test-graph.tcp.js b/test/async-hooks/test-graph.tcp.js
index f9703769b8..8726159907 100644
--- a/test/async-hooks/test-graph.tcp.js
+++ b/test/async-hooks/test-graph.tcp.js
@@ -1,14 +1,11 @@
 'use strict';
 
 const common = require('../common');
-const initHooks = require('./init-hooks');
-const verifyGraph = require('./verify-graph');
-
-if (!common.hasIPv6) {
+if (!common.hasIPv6)
   common.skip('IPv6 support required');
-  return;
-}
 
+const initHooks = require('./init-hooks');
+const verifyGraph = require('./verify-graph');
 const net = require('net');
 
 const hooks = initHooks();
diff --git a/test/async-hooks/test-graph.tls-write.js b/test/async-hooks/test-graph.tls-write.js
index 77a97bedbc..338a714c32 100644
--- a/test/async-hooks/test-graph.tls-write.js
+++ b/test/async-hooks/test-graph.tls-write.js
@@ -1,21 +1,17 @@
 'use strict';
 
 const common = require('../common');
-const initHooks = require('./init-hooks');
-const verifyGraph = require('./verify-graph');
-const fs = require('fs');
-
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
 
-if (!common.hasIPv6) {
+if (!common.hasIPv6)
   common.skip('IPv6 support required');
-  return;
-}
 
+const initHooks = require('./init-hooks');
+const verifyGraph = require('./verify-graph');
+const fs = require('fs');
 const tls = require('tls');
+
 const hooks = initHooks();
 hooks.enable();
 
diff --git a/test/async-hooks/test-tcpwrap.js b/test/async-hooks/test-tcpwrap.js
index 0dce8c7d9f..b4021753a0 100644
--- a/test/async-hooks/test-tcpwrap.js
+++ b/test/async-hooks/test-tcpwrap.js
@@ -2,16 +2,13 @@
 'use strict';
 
 const common = require('../common');
+if (!common.hasIPv6)
+  common.skip('IPv6 support required');
+
 const assert = require('assert');
 const tick = require('./tick');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
-
-if (!common.hasIPv6) {
-  common.skip('IPv6 support required');
-  return;
-}
-
 const net = require('net');
 
 let tcp1, tcp2, tcp3;
diff --git a/test/async-hooks/test-tlswrap.js b/test/async-hooks/test-tlswrap.js
index 47cca62c18..878afac063 100644
--- a/test/async-hooks/test-tlswrap.js
+++ b/test/async-hooks/test-tlswrap.js
@@ -1,18 +1,16 @@
 'use strict';
 
 const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
 const assert = require('assert');
 const tick = require('./tick');
 const initHooks = require('./init-hooks');
 const fs = require('fs');
 const { checkInvocations } = require('./hook-checks');
-
-if (!common.hasCrypto) {
-  common.skip('missing crypto');
-  return;
-}
-
 const tls = require('tls');
+
 const hooks = initHooks();
 hooks.enable();
 
diff --git a/test/async-hooks/test-ttywrap.writestream.js b/test/async-hooks/test-ttywrap.writestream.js
index b1cc768877..990460b537 100644
--- a/test/async-hooks/test-ttywrap.writestream.js
+++ b/test/async-hooks/test-ttywrap.writestream.js
@@ -1,14 +1,16 @@
 'use strict';
 
 const common = require('../common');
+
+const tty_fd = common.getTTYfd();
+if (tty_fd < 0)
+  common.skip('no valid TTY fd available');
+
 const assert = require('assert');
 const tick = require('./tick');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
-const tty_fd = common.getTTYfd();
 
-if (tty_fd < 0)
-  return common.skip('no valid TTY fd available');
 const ttyStream = (() => {
   try {
     return new (require('tty').WriteStream)(tty_fd);
@@ -17,7 +19,7 @@ const ttyStream = (() => {
   }
 })();
 if (ttyStream === null)
-  return common.skip('no valid TTY fd available');
+  common.skip('no valid TTY fd available');
 
 const hooks = initHooks();
 hooks.enable();
diff --git a/test/async-hooks/test-writewrap.js b/test/async-hooks/test-writewrap.js
index 6253b09d4a..eca0d08f10 100644
--- a/test/async-hooks/test-writewrap.js
+++ b/test/async-hooks/test-writewrap.js
@@ -1,17 +1,15 @@
 'use strict';
 
 const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
 const assert = require('assert');
 const initHooks = require('./init-hooks');
 const fs = require('fs');
 const { checkInvocations } = require('./hook-checks');
-
-if (!common.hasCrypto) {
-  common.skip('missing crypto');
-  return;
-}
-
 const tls = require('tls');
+
 const hooks = initHooks();
 hooks.enable();