summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSantiago Gimeno <santiago.gimeno@gmail.com>2016-04-12 17:22:07 +0200
committerSantiago Gimeno <santiago.gimeno@gmail.com>2016-04-19 09:08:02 +0200
commitbf22c71a7ab8417d7cf5c59d9e18e891137abfb8 (patch)
tree728311eb3488965d744e210ccf77e6f0fb3aacf2 /test
parentc7fef3d3b8763d55a238786b56f91939f10f2c36 (diff)
downloadandroid-node-v8-bf22c71a7ab8417d7cf5c59d9e18e891137abfb8.tar.gz
android-node-v8-bf22c71a7ab8417d7cf5c59d9e18e891137abfb8.tar.bz2
android-node-v8-bf22c71a7ab8417d7cf5c59d9e18e891137abfb8.zip
test: fix test-net-settimeout flakiness
Wait for the data to be received by the socket before creating the clean-up timer. This way, a possible (though unlikely) `ECONNRESET` error can be avoided. PR-URL: https://github.com/nodejs/node/pull/6166 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-net-settimeout.js20
1 files changed, 11 insertions, 9 deletions
diff --git a/test/parallel/test-net-settimeout.js b/test/parallel/test-net-settimeout.js
index 76ed7b020f..db0329deea 100644
--- a/test/parallel/test-net-settimeout.js
+++ b/test/parallel/test-net-settimeout.js
@@ -8,22 +8,24 @@ const assert = require('assert');
const T = 100;
-const server = net.createServer(function(c) {
+const server = net.createServer(common.mustCall((c) => {
c.write('hello');
-});
+}));
+
server.listen(common.PORT);
const socket = net.createConnection(common.PORT, 'localhost');
-const s = socket.setTimeout(T, function() {
+const s = socket.setTimeout(T, () => {
common.fail('Socket timeout event is not expected to fire');
});
assert.ok(s instanceof net.Socket);
-socket.setTimeout(0);
-
-setTimeout(function() {
- socket.destroy();
- server.close();
-}, T * 2);
+socket.on('data', common.mustCall(() => {
+ setTimeout(function() {
+ socket.destroy();
+ server.close();
+ }, T * 2);
+}));
+socket.setTimeout(0);