test: ensure assertions are reached on HTTP2 tests

Author: aduh95

test/eslint.config_partial.mjs

@@ -195,7 +195,7 @@ export default [
       `test/parallel/test-{${
         // 0x61 is code for 'a', this generates a string enumerating latin letters: 'a*,b*,…'
         Array.from({ length: 4 }, (_, i) => String.fromCharCode(0x61 + i, 42)).join(',')
-      },${
+      },http2-*,${
         // 0x61 is code for 'a', this generates a string enumerating latin letters: 'z*,y*,…'
         Array.from({ length: 5 }, (_, i) => String.fromCharCode(0x61 + 25 - i, 42)).join(',')
       }}.{js,mjs,cjs}`,

test/parallel/test-http2-alpn.js

@@ -34,7 +34,7 @@ const tls = require('tls');
     })
   );
 
-  server.listen(0, function() {
+  server.listen(0, common.mustCall(() => {
     const client = tls.connect({
       port: server.address().port,
       rejectUnauthorized: false,
@@ -43,5 +43,5 @@ const tls = require('tls');
       assert.strictEqual(client.alpnProtocol, 'a');
       client.end();
     }));
-  });
+  }));
 }

test/parallel/test-http2-async-local-storage.js

@@ -25,7 +25,7 @@ server.on('stream', (stream) => {
   stream.end('data');
 });
 
-server.listen(0, async () => {
+server.listen(0, common.mustCall(async () => {
   const client = storage.run({ id: 0 }, () => http2.connect(`http://localhost:${server.address().port}`));
 
   async function doReq(id) {
@@ -52,4 +52,4 @@ server.listen(0, async () => {
 
   doReqWith(1);
   doReqWith(2);
-});
+}));

test/parallel/test-http2-backpressure.js

@@ -12,7 +12,7 @@ const { duplexPair } = require('stream');
 {
   let req;
   const server = http2.createServer();
-  server.on('stream', mustCallAsync(async (stream, headers) => {
+  server.on('stream', mustCall(async (stream, headers) => {
     stream.respond({
       'content-type': 'text/html',
       ':status': 200
@@ -46,7 +46,7 @@ function event(ee, eventName) {
   });
 }
 
-function mustCallAsync(fn, exact) {
+function mustCall(fn, exact) {
   return common.mustCall((...args) => {
     return Promise.resolve(fn(...args)).then(common.mustCall((val) => val));
   }, exact);

test/parallel/test-http2-cancel-while-client-reading.js

@@ -23,7 +23,7 @@ server.on('stream', common.mustCall(function(stream) {
   stream.on('error', () => {});
 }));
 
-server.listen(0, function() {
+server.listen(0, common.mustCall(() => {
   const client = http2.connect(`https://localhost:${server.address().port}`,
                                { rejectUnauthorized: false }
   );
@@ -34,4 +34,4 @@ server.listen(0, function() {
   }));
   client_stream.resume();
   client_stream.write(Buffer.alloc(1024 * 1024));
-});
+}));

test/parallel/test-http2-clean-output.js

@@ -8,9 +8,7 @@ const {
 if (!hasCrypto)
   skip('missing crypto');
 
-const {
-  strictEqual
-} = require('assert');
+const assert = require('assert');
 const {
   createServer,
   connect
@@ -25,9 +23,9 @@ if (process.argv[2] !== 'child') {
   const {
     stdout, stderr, status
   } = spawnSync(process.execPath, [__filename, 'child'], { encoding: 'utf8' });
-  strictEqual(stderr, '');
-  strictEqual(stdout, '');
-  strictEqual(status, 0);
+  assert.strictEqual(stderr, '');
+  assert.strictEqual(stdout, '');
+  assert.strictEqual(status, 0);
 } else {
   const server = createServer();
   server.listen(0, mustCall(() => {

test/parallel/test-http2-client-data-end.js

@@ -10,16 +10,15 @@ const Countdown = require('../common/countdown');
 const server = http2.createServer();
 server.on('stream', common.mustCall((stream, headers, flags) => {
   if (headers[':path'] === '/') {
-    stream.pushStream({ ':path': '/foobar' }, (err, push, headers) => {
-      assert.ifError(err);
+    stream.pushStream({ ':path': '/foobar' }, common.mustSucceed((push, headers) => {
       push.respond({
         'content-type': 'text/html',
         'x-push-data': 'pushed by server',
       });
       push.write('pushed by server ');
       setImmediate(() => push.end('data'));
       stream.end('st');
-    });
+    }));
   }
   stream.respond({ 'content-type': 'text/html' });
   stream.write('te');

test/parallel/test-http2-client-destroy.js

@@ -86,15 +86,15 @@ const { getEventListeners } = require('events');
 
     // Wait for setImmediate call from destroy() to complete
     // so that state.destroyed is set to true
-    setImmediate(() => {
+    setImmediate(common.mustCall(() => {
       assert.throws(() => client.setNextStreamID(), sessionError);
       assert.throws(() => client.setLocalWindowSize(), sessionError);
       assert.throws(() => client.ping(), sessionError);
       assert.throws(() => client.settings({}), sessionError);
       assert.throws(() => client.goaway(), sessionError);
       assert.throws(() => client.request(), sessionError);
       client.close();  // Should be a non-op at this point
-    });
+    }));
 
     req.resume();
     req.on('end', common.mustNotCall());

test/parallel/test-http2-client-jsstream-destroy.js

@@ -39,7 +39,7 @@ server.listen(0, common.mustCall(function() {
     host: 'localhost',
     port: this.address().port,
     ALPNProtocols: ['h2']
-  }, () => {
+  }, common.mustCall(() => {
     const proxy = new JSSocket(socket);
     const client = h2.connect(`https://localhost:${this.address().port}`, {
       createConnection: () => proxy
@@ -54,5 +54,5 @@ server.listen(0, common.mustCall(function() {
       client.close();
       server.close();
     }));
-  });
+  }));
 }));

test/parallel/test-http2-client-request-options-errors.js

@@ -32,7 +32,7 @@ server.listen(0, common.mustCall(() => {
   const port = server.address().port;
   const client = http2.connect(`http://localhost:${port}`);
 
-  client.on('connect', () => {
+  client.on('connect', common.mustCall(() => {
     Object.keys(optionsToTest).forEach((option) => {
       Object.keys(types).forEach((type) => {
         if (type === optionsToTest[option])
@@ -52,5 +52,5 @@ server.listen(0, common.mustCall(() => {
     });
     server.close();
     client.close();
-  });
+  }));
 }));