From 559c2583e0589a322087b85e51cc140c5f7fb5fa Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 30 Apr 2016 22:23:09 -0700 Subject: [PATCH] lib,test: update in preparation for linter update ESLint 2.9.0 fixes some bugs that resulted in minor issues not being caught by ESLint 2.7.0. Update instances of our code that will be flagged when we upgrade to ESLint 2.9.0. PR-URL: https://github.com/nodejs/node/pull/6498 Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Roman Reiss --- lib/internal/readline.js | 1 + test/parallel/test-http-destroyed-socket-write2.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/internal/readline.js b/lib/internal/readline.js index 3248c7c50ae27e..1cc0b58d6756a2 100644 --- a/lib/internal/readline.js +++ b/lib/internal/readline.js @@ -1,6 +1,7 @@ 'use strict'; // Regexes used for ansi escape code splitting +// eslint-disable-next-line no-control-regex const metaKeyCodeReAnywhere = /(?:\x1b)([a-zA-Z0-9])/; const functionKeyCodeReAnywhere = new RegExp('(?:\x1b+)(O|N|\\[|\\[\\[)(?:' + [ '(\\d+)(?:;(\\d+))?([~^$])', diff --git a/test/parallel/test-http-destroyed-socket-write2.js b/test/parallel/test-http-destroyed-socket-write2.js index 771fd303594e92..7588393840f2cc 100644 --- a/test/parallel/test-http-destroyed-socket-write2.js +++ b/test/parallel/test-http-destroyed-socket-write2.js @@ -29,12 +29,17 @@ server.listen(common.PORT, function() { switch (er.code) { // This is the expected case case 'ECONNRESET': - // On windows this sometimes manifests as ECONNABORTED + break; + + // On Windows, this sometimes manifests as ECONNABORTED case 'ECONNABORTED': + break; + // This test is timing sensitive so an EPIPE is not out of the question. // It should be infrequent, given the 50 ms timeout, but not impossible. case 'EPIPE': break; + default: assert.strictEqual(er.code, 'ECONNRESET',