aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2015-11-23 16:01:35 -0800
committerRich Trott <rtrott@gmail.com>2015-11-24 19:38:21 -0800
commitb061e3af55d15a65507c263220bd582063640da8 (patch)
treec3e556504e420192b03bc7f5ebc7e2460dfe62f3 /test
parentd7b199d9e37c7979ab1e8da4cbb160f067ff3f83 (diff)
downloadandroid-node-v8-b061e3af55d15a65507c263220bd582063640da8.tar.gz
android-node-v8-b061e3af55d15a65507c263220bd582063640da8.tar.bz2
android-node-v8-b061e3af55d15a65507c263220bd582063640da8.zip
test: skip test if in FreeBSD jail
Test test-net-socket-local-address is flaky in FreeBSD jail but robust otherwise. Fixes: https://github.com/nodejs/node/issues/2475 PR-URL: https://github.com/nodejs/node/pull/3995 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Johan Bergström <bugs@bergstroem.nu> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/parallel.status1
-rw-r--r--test/parallel/test-net-socket-local-address.js20
2 files changed, 13 insertions, 8 deletions
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 189083819d..4a8aab5e53 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -19,4 +19,3 @@ test-child-process-exit-code : PASS,FLAKY
[$system==solaris] # Also applies to SmartOS
[$system==freebsd]
-test-net-socket-local-address : PASS,FLAKY
diff --git a/test/parallel/test-net-socket-local-address.js b/test/parallel/test-net-socket-local-address.js
index 4c0e31d08c..502c2d226d 100644
--- a/test/parallel/test-net-socket-local-address.js
+++ b/test/parallel/test-net-socket-local-address.js
@@ -1,24 +1,30 @@
'use strict';
-var common = require('../common');
-var assert = require('assert');
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
+
+// skip test in FreeBSD jails
+if (common.inFreeBSDJail) {
+ console.log('1..0 # Skipped: In a FreeBSD jail');
+ return;
+}
var conns = 0;
var clientLocalPorts = [];
var serverRemotePorts = [];
-var server = net.createServer(function(socket) {
+const server = net.createServer(function(socket) {
serverRemotePorts.push(socket.remotePort);
conns++;
});
-var client = new net.Socket();
+const client = new net.Socket();
-server.on('close', function() {
+server.on('close', common.mustCall(function() {
assert.deepEqual(clientLocalPorts, serverRemotePorts,
'client and server should agree on the ports used');
assert.equal(2, conns);
-});
+}));
server.listen(common.PORT, common.localhostIPv4, testConnect);