test: improve code coverage

index.js

@@ -7,7 +7,7 @@ module.exports = (options = {}) => {
   const logger = options.logger || console;
   const label = options.label || `graceful-process#${process.pid}`;
   if (process[init]) {
-    logger.warn('[graceful-process] [%s] init already', label);
+    logger.warn('[%s] graceful-process init already', label);
     return;
   }
   process[init] = true;

package.json

@@ -9,7 +9,7 @@
     "lint": "eslint *.js test",
     "test": "npm run lint && npm run test-local",
     "test-local": "egg-bin test",
-    "cov": "egg-bin cov",
+    "cov": "cross-env COV=true egg-bin cov",
     "autod": "autod",
     "ci": "npm run lint && npm run cov"
   },
@@ -25,6 +25,7 @@
   "devDependencies": {
     "autod": "^2.8.0",
     "coffee": "^3.3.2",
+    "cross-env": "^5.0.1",
     "egg-bin": "^3.4.2",
     "egg-ci": "^1.7.0",
     "eslint": "^3.19.0",

test/fixtures/child.js

@@ -8,4 +8,9 @@ http.createServer((req, res) => {
 }).listen(8000);
 
 console.log(`Worker ${process.pid} started`);
+require('../..')({
+  logger: console,
+  label: 'test-child',
+});
+// run again should work
 require('../..')();

test/fixtures/cluster.js

@@ -2,13 +2,12 @@
 
 const cluster = require('cluster');
 const http = require('http');
-const numCPUs = require('os').cpus().length;
 
 if (cluster.isMaster) {
   console.log(`Master ${process.pid} is running`);
 
   // Fork workers.
-  for (let i = 0; i < numCPUs; i++) {
+  for (let i = 0; i < 2; i++) {
     cluster.fork();
   }
 
@@ -30,6 +29,9 @@ if (cluster.isMaster) {
   http.createServer((req, res) => {
     res.writeHead(200);
     res.end('hello world\n');
+    if (req.url === '/suicide') {
+      cluster.worker.disconnect();
+    }
   }).listen(8000);
 
   console.log(`Worker ${process.pid} started`);

test/index.test.js

@@ -7,7 +7,7 @@ const sleep = require('mz-modules/sleep');
 const urllib = require('urllib');
 
 const fixtures = path.join(__dirname, 'fixtures');
-const waitStart = process.env.CI ? 20000 : 2000;
+const waitStart = process.env.COV ? 30000 : 2000;
 
 describe('test/index.test.js', () => {
   describe('cluster', () => {
@@ -34,6 +34,11 @@ describe('test/index.test.js', () => {
       const result = yield urllib.request('http://127.0.0.1:8000/');
       assert(result.status === 200);
       assert(result.data.toString() === 'hello world\n');
+      // suicide
+      const result2 = yield urllib.request('http://127.0.0.1:8000/suicide');
+      assert(result2.status === 200);
+      assert(result2.data.toString() === 'hello world\n');
+      yield sleep(1000);
       // make sure all workers exit by itself after SIGTERM event fired
       child.proc.kill('SIGTERM');
       yield sleep(1000);