net: use ERR_INVALID_ARG_VALUE instead of ERR_INVALID_OPT_VALUE

nodejs · Aug 22, 2018 · 630d987 · 630d987
1 parent 7be75d8
commit 630d987
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/lib/net.js b/lib/net.js
@@ -68,6 +68,7 @@ const errors = require('internal/errors');
 const {
   ERR_INVALID_ADDRESS_FAMILY,
   ERR_INVALID_ARG_TYPE,
+  ERR_INVALID_ARG_VALUE,
   ERR_INVALID_FD_TYPE,
   ERR_INVALID_IP_ADDRESS,
   ERR_INVALID_OPT_VALUE,
@@ -1496,15 +1497,12 @@ Server.prototype.listen = function(...args) {
     return this;
   }
 
-  let additionalMessage;
-  if (typeof options === 'object' &&
-    !(('port' in options) || ('path' in options))) {
-
-    additionalMessage = '"port" or "path" must be specified in options.';
+  if (!(('port' in options) || ('path' in options))) {
+    throw new ERR_INVALID_ARG_VALUE('options', options,
+                                    'must have the property "port" or "path"');
   }
 
-  throw new ERR_INVALID_OPT_VALUE('options', util.inspect(options),
-                                  additionalMessage);
+  throw new ERR_INVALID_OPT_VALUE('options', util.inspect(options));
 };
 
 function lookupAndListen(self, port, address, backlog, exclusive) {

diff --git a/test/parallel/test-net-server-listen-options.js b/test/parallel/test-net-server-listen-options.js
@@ -58,12 +58,22 @@ const listenOnPort = [
       net.createServer().listen(options, common.mustNotCall());
     };
 
-    common.expectsError(block,
-                        {
-                          code: 'ERR_INVALID_OPT_VALUE',
-                          type: TypeError,
-                          message: /^The value "{.*}" is invalid for option "options"(?:\. .+)?$/,
-                        });
+    if (typeof options === 'object' &&
+      !(('port' in options) || ('path' in options))) {
+      common.expectsError(block,
+                          {
+                            code: 'ERR_INVALID_ARG_VALUE',
+                            type: TypeError,
+                            message: /^The argument 'options' must have the property "port" or "path"\. Received .+$/,
+                          });
+    } else {
+      common.expectsError(block,
+                          {
+                            code: 'ERR_INVALID_OPT_VALUE',
+                            type: TypeError,
+                            message: /^The value "{.*}" is invalid for option "options"(?:\. .+)?$/,
+                          });
+    }
   }
 
   shouldFailToListen(false, { port: false });