From 7db43c3d99048c96385054188d81b4487b025287 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Tue, 10 Jul 2018 18:29:52 +0800 Subject: [PATCH 1/3] test: run test on node 10 --- .travis.yml | 2 +- appveyor.yml | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a1bf61..2c198ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ node_js: - '4' - '6' - '8' - - '9' + - '10' install: - npm i npminstall && npminstall script: diff --git a/appveyor.yml b/appveyor.yml index 181ac89..cb07670 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ environment: - nodejs_version: '4' - nodejs_version: '6' - nodejs_version: '8' - - nodejs_version: '9' + - nodejs_version: '10' install: - ps: Install-Product node $env:nodejs_version diff --git a/package.json b/package.json index d297c59..a057d48 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "node": ">= 4.0.0" }, "ci": { - "version": "4.3.2, 4, 6, 8, 9" + "version": "4.3.2, 4, 6, 8, 10" }, "author": "fengmk2 (https://fengmk2.com)", "license": "MIT" From 3c8403be64e2836f2debde0a502b7bfe22d408ac Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Tue, 10 Jul 2018 18:37:49 +0800 Subject: [PATCH 2/3] f --- .autod.conf | 2 ++ benchmark/proxy.js | 12 +----------- package.json | 10 +++++----- test/agent.test.js | 18 +++++++++--------- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.autod.conf b/.autod.conf index f33538c..ae55eee 100644 --- a/.autod.conf +++ b/.autod.conf @@ -20,5 +20,7 @@ module.exports = { ], semver: [ 'egg-bin@1', + 'eslint@4', + 'eslint-config-egg@6', ], }; diff --git a/benchmark/proxy.js b/benchmark/proxy.js index d9bbb74..f5c8b60 100644 --- a/benchmark/proxy.js +++ b/benchmark/proxy.js @@ -1,14 +1,4 @@ -/*! - * agentkeepalive - benchmark/proxy.js - * Copyright(c) 2012 fengmk2 - * MIT Licensed - */ - -"use strict"; - -/** - * Module dependencies. - */ +'use strict'; var http = require('http'); var AgentKeepalive = require('../'); diff --git a/package.json b/package.json index a057d48..eb43770 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "humanize-ms": "^1.2.1" }, "devDependencies": { - "autod": "^2.8.0", - "egg-bin": "^1.10.3", - "egg-ci": "^1.7.0", - "eslint": "^3.19.0", - "eslint-config-egg": "^4.2.0", + "autod": "^3.0.1", + "egg-bin": "^1.11.1", + "egg-ci": "^1.8.0", + "eslint": "^4.19.1", + "eslint-config-egg": "^6.0.0", "pedding": "^1.1.0" }, "engines": { diff --git a/test/agent.test.js b/test/agent.test.js index 4b3f455..9e883ca 100644 --- a/test/agent.test.js +++ b/test/agent.test.js @@ -938,10 +938,10 @@ describe('test/agent.test.js', () => { }, () => { throw new Error('should not run this'); }) - .on('error', () => { - assert(agentkeepalive.sockets[name].length === 1); - done(); - }); + .on('error', () => { + assert(agentkeepalive.sockets[name].length === 1); + done(); + }); http.get({ agent: agentkeepalive, @@ -950,9 +950,9 @@ describe('test/agent.test.js', () => { }, () => { throw new Error('should not run this'); }) - .on('error', () => { + .on('error', () => { // do noting - }); + }); http.get({ agent: agentkeepalive, @@ -961,9 +961,9 @@ describe('test/agent.test.js', () => { }, () => { throw new Error('should not run this'); }) - .on('error', () => { - // do noting - }); + .on('error', () => { + // do noting + }); assert(Object.keys(agentkeepalive.sockets).length === 1); }); From 8105dbc4993b9a39d3e4dd4794843c5b2277f9fc Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Tue, 10 Jul 2018 20:55:58 +0800 Subject: [PATCH 3/3] f --- .travis.yml | 1 - appveyor.yml | 1 - package.json | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c198ac..9edb713 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: node_js node_js: - - '4.3.2' - '4' - '6' - '8' diff --git a/appveyor.yml b/appveyor.yml index cb07670..d3108c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,5 @@ environment: matrix: - - nodejs_version: '4.3.2' - nodejs_version: '4' - nodejs_version: '6' - nodejs_version: '8' diff --git a/package.json b/package.json index eb43770..dfaf300 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "node": ">= 4.0.0" }, "ci": { - "version": "4.3.2, 4, 6, 8, 10" + "version": "4, 6, 8, 10" }, "author": "fengmk2 (https://fengmk2.com)", "license": "MIT"