From 32853c0a136b0616844cdf5c276d2f1eb9a4fc50 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sun, 10 Mar 2019 15:37:51 +0100 Subject: lib,test: improve faulty assert usage detection This improves our custom eslint rules to detect assertions to detect assertions with only a single argument and fixes false negatives in case unary expressions are used. Some rules were extended to also lint our docs and tools and the lib rule was simplified to prohibit most assertion calls. PR-URL: https://github.com/nodejs/node/pull/26569 Refs: https://github.com/nodejs/node/pull/26565 Reviewed-By: James M Snell Reviewed-By: Rich Trott Reviewed-By: Richard Lau --- lib/internal/js_stream_socket.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/internal/js_stream_socket.js') diff --git a/lib/internal/js_stream_socket.js b/lib/internal/js_stream_socket.js index 8343b6c264..038aa56c42 100644 --- a/lib/internal/js_stream_socket.js +++ b/lib/internal/js_stream_socket.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('internal/assert'); const util = require('util'); const { Socket } = require('net'); const { JSStream } = internalBinding('js_stream'); @@ -122,8 +122,8 @@ class JSStreamSocket extends Socket { this[kPendingShutdownRequest] = req; return 0; } - assert.strictEqual(this[kCurrentWriteRequest], null); - assert.strictEqual(this[kCurrentShutdownRequest], null); + assert(this[kCurrentWriteRequest] === null); + assert(this[kCurrentShutdownRequest] === null); this[kCurrentShutdownRequest] = req; const handle = this._handle; @@ -148,8 +148,8 @@ class JSStreamSocket extends Socket { } doWrite(req, bufs) { - assert.strictEqual(this[kCurrentWriteRequest], null); - assert.strictEqual(this[kCurrentShutdownRequest], null); + assert(this[kCurrentWriteRequest] === null); + assert(this[kCurrentShutdownRequest] === null); const handle = this._handle; const self = this; @@ -214,7 +214,7 @@ class JSStreamSocket extends Socket { setImmediate(() => { // Should be already set by net.js - assert.strictEqual(this._handle, null); + assert(this._handle === null); this.finishWrite(handle, uv.UV_ECANCELED); this.finishShutdown(handle, uv.UV_ECANCELED); -- cgit v1.2.3