From 3a86bee5a066c97226913532e247e72bc1d627fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AC=91=E6=96=8C?= <xinlei.sxl@alibaba-inc.com>
Date: Sun, 16 Jul 2017 15:46:41 +0800
Subject: [PATCH] test: remove exit handler & add common.mustCall

---
 .../test-http-server-keep-alive-timeout.js    | 22 ++-------------
 .../test-https-server-keep-alive-timeout.js   | 28 ++++++-------------
 2 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/test/parallel/test-http-server-keep-alive-timeout.js b/test/parallel/test-http-server-keep-alive-timeout.js
index 4b41f5f92ccb99..e8ecd96fc30a3f 100644
--- a/test/parallel/test-http-server-keep-alive-timeout.js
+++ b/test/parallel/test-http-server-keep-alive-timeout.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common');
-const assert = require('assert');
 const http = require('http');
 const net = require('net');
 
@@ -20,16 +19,9 @@ function run() {
 }
 
 test(function serverEndKeepAliveTimeoutWithPipeline(cb) {
-  let requestCount = 0;
-  const server = http.createServer((req, res) => {
-    requestCount++;
+  const server = http.createServer(common.mustCall((req, res) => {
     res.end();
-  });
-  server.listen(0, common.mustCall(() => {
-    process.on('exit', () => {
-      assert.strictEqual(requestCount, 3);
-    });
-  }));
+  }, 3));
   server.setTimeout(500, common.mustCall((socket) => {
     // End this test and call `run()` for the next test (if any).
     socket.destroy();
@@ -51,15 +43,7 @@ test(function serverEndKeepAliveTimeoutWithPipeline(cb) {
 });
 
 test(function serverNoEndKeepAliveTimeoutWithPipeline(cb) {
-  let requestCount = 0;
-  const server = http.createServer((req, res) => {
-    requestCount++;
-  });
-  server.listen(0, common.mustCall(() => {
-    process.on('exit', () => {
-      assert.strictEqual(requestCount, 3);
-    });
-  }));
+  const server = http.createServer(common.mustCall((req, res) => {}, 3));
   server.setTimeout(500, common.mustCall((socket) => {
     // End this test and call `run()` for the next test (if any).
     socket.destroy();
diff --git a/test/parallel/test-https-server-keep-alive-timeout.js b/test/parallel/test-https-server-keep-alive-timeout.js
index baf8e17975102e..f328d05fffd8c0 100644
--- a/test/parallel/test-https-server-keep-alive-timeout.js
+++ b/test/parallel/test-https-server-keep-alive-timeout.js
@@ -4,7 +4,6 @@ const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
-const assert = require('assert');
 const https = require('https');
 const tls = require('tls');
 const fs = require('fs');
@@ -29,16 +28,11 @@ function run() {
 }
 
 test(function serverKeepAliveTimeoutWithPipeline(cb) {
-  let requestCount = 0;
-  const server = https.createServer(serverOptions, (req, res) => {
-    requestCount++;
-    res.end();
-  });
-  server.listen(0, common.mustCall(() => {
-    process.on('exit', function() {
-      assert.strictEqual(requestCount, 3);
-    });
-  }));
+  const server = https.createServer(
+    serverOptions,
+    common.mustCall((req, res) => {
+      res.end();
+    }, 3));
   server.setTimeout(500, common.mustCall((socket) => {
     // End this test and call `run()` for the next test (if any).
     socket.destroy();
@@ -61,15 +55,9 @@ test(function serverKeepAliveTimeoutWithPipeline(cb) {
 });
 
 test(function serverNoEndKeepAliveTimeoutWithPipeline(cb) {
-  let requestCount = 0;
-  const server = https.createServer(serverOptions, (req, res) => {
-    requestCount++;
-  });
-  server.listen(0, common.mustCall(() => {
-    process.on('exit', function() {
-      assert.strictEqual(requestCount, 3);
-    });
-  }));
+  const server = https.createServer(
+    serverOptions,
+    common.mustCall((req, res) => {}, 3));
   server.setTimeout(500, common.mustCall((socket) => {
     // End this test and call `run()` for the next test (if any).
     socket.destroy();