From e0c4e29a7c46aed91ce3455c00c6b032adef3565 Mon Sep 17 00:00:00 2001 From: Artur Vieira Date: Fri, 12 May 2017 14:11:06 +0000 Subject: [PATCH 1/5] test: improve net-immediate-finish-test this tests need to fail, it's more "sanitary" to run it in /sequential/ Ref: https://github.com/nodejs/node/issues/12376 --- .../test-net-connect-immediate-finish.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename test/{parallel => sequential}/test-net-connect-immediate-finish.js (85%) diff --git a/test/parallel/test-net-connect-immediate-finish.js b/test/sequential/test-net-connect-immediate-finish.js similarity index 85% rename from test/parallel/test-net-connect-immediate-finish.js rename to test/sequential/test-net-connect-immediate-finish.js index 209b90d71d0e84..e66d5be4690457 100644 --- a/test/parallel/test-net-connect-immediate-finish.js +++ b/test/sequential/test-net-connect-immediate-finish.js @@ -24,14 +24,17 @@ const common = require('../common'); const assert = require('assert'); const net = require('net'); -const client = net.connect({host: '***', port: common.PORT}); +const unfindable_host = '***'; +// port 0 is hardcoded since this does not create a network connection +const arbitrary_port = common.PORT +const client = net.connect({host: unfindable_host, port: arbitrary_port}); client.once('error', common.mustCall((err) => { assert(err); assert.strictEqual(err.code, err.errno); assert.strictEqual(err.code, 'ENOTFOUND'); assert.strictEqual(err.host, err.hostname); - assert.strictEqual(err.host, '***'); + assert.strictEqual(err.host, unfindable_host); assert.strictEqual(err.syscall, 'getaddrinfo'); })); From 0122232e64366f09a1a85980586c5405be45c722 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Tue, 16 May 2017 16:02:07 -0400 Subject: [PATCH 2/5] [squash] add comment --- test/sequential/test-net-connect-immediate-finish.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sequential/test-net-connect-immediate-finish.js b/test/sequential/test-net-connect-immediate-finish.js index e66d5be4690457..3b87650f1a2ac6 100644 --- a/test/sequential/test-net-connect-immediate-finish.js +++ b/test/sequential/test-net-connect-immediate-finish.js @@ -25,7 +25,7 @@ const assert = require('assert'); const net = require('net'); const unfindable_host = '***'; -// port 0 is hardcoded since this does not create a network connection +// since this test should fail with `ENOTFOUND` we pick an arbitrary valid port const arbitrary_port = common.PORT const client = net.connect({host: unfindable_host, port: arbitrary_port}); From 9e65d85793a6d42213f5a6ced7ca6be1adb45fdd Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Tue, 16 May 2017 17:48:47 -0400 Subject: [PATCH 3/5] [squash] add comments and one more assert --- .../test-net-connect-immediate-finish.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/test/sequential/test-net-connect-immediate-finish.js b/test/sequential/test-net-connect-immediate-finish.js index 3b87650f1a2ac6..0040e1b024e578 100644 --- a/test/sequential/test-net-connect-immediate-finish.js +++ b/test/sequential/test-net-connect-immediate-finish.js @@ -21,21 +21,29 @@ 'use strict'; const common = require('../common'); + +// This test ensures that `net.connect` with an unfindable host will emit +// an error, and we assert the structure of the error. + const assert = require('assert'); const net = require('net'); -const unfindable_host = '***'; -// since this test should fail with `ENOTFOUND` we pick an arbitrary valid port +// since this test should fail with `ENOTFOUND` becuase of the unfindable host +// we don't care about the port, so we just pick an arbitrary but valid port const arbitrary_port = common.PORT +const unfindable_host = '***'; const client = net.connect({host: unfindable_host, port: arbitrary_port}); client.once('error', common.mustCall((err) => { - assert(err); + assert.ok(err); assert.strictEqual(err.code, err.errno); assert.strictEqual(err.code, 'ENOTFOUND'); assert.strictEqual(err.host, err.hostname); assert.strictEqual(err.host, unfindable_host); assert.strictEqual(err.syscall, 'getaddrinfo'); + assert.strictEqual( + err.message, + `getaddrinfo ENOTFOUND ${unfindable_host} ${unfindable_host}:${err.port}` + ); + client.end(); })); - -client.end(); From fc9d8c8de08cb6b56512cac530055776f775ceb2 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Tue, 16 May 2017 19:17:51 -0400 Subject: [PATCH 4/5] [squash] add another assert --- test/sequential/test-net-connect-immediate-finish.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/sequential/test-net-connect-immediate-finish.js b/test/sequential/test-net-connect-immediate-finish.js index 0040e1b024e578..f857c3ef50a8a3 100644 --- a/test/sequential/test-net-connect-immediate-finish.js +++ b/test/sequential/test-net-connect-immediate-finish.js @@ -45,5 +45,7 @@ client.once('error', common.mustCall((err) => { err.message, `getaddrinfo ENOTFOUND ${unfindable_host} ${unfindable_host}:${err.port}` ); - client.end(); })); +client.on('connect', common.mustNotCall()) + +client.end(); From ba58f325aa2d6aca811d25326ce2dc3ae231ee65 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Tue, 13 Jun 2017 16:33:19 -0400 Subject: [PATCH 5/5] Sentence case --- test/sequential/test-net-connect-immediate-finish.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/sequential/test-net-connect-immediate-finish.js b/test/sequential/test-net-connect-immediate-finish.js index f857c3ef50a8a3..d94d734e7f2857 100644 --- a/test/sequential/test-net-connect-immediate-finish.js +++ b/test/sequential/test-net-connect-immediate-finish.js @@ -28,8 +28,8 @@ const common = require('../common'); const assert = require('assert'); const net = require('net'); -// since this test should fail with `ENOTFOUND` becuase of the unfindable host -// we don't care about the port, so we just pick an arbitrary but valid port +// Since this test should fail with `ENOTFOUND` becuase of the unfindable host +// we don't care about the port, so we just pick an arbitrary but valid port. const arbitrary_port = common.PORT const unfindable_host = '***'; const client = net.connect({host: unfindable_host, port: arbitrary_port});