Commit b60e690
test: improve test-net-server-pause-on-connect
Previously the test had a massive timeout (3s!), reduce this to a
platform specific timeout of 50ms.
This test runs two servers at the same time in an attempt to compare
behaviour. I've added a check to make sure one event fires before the
other event, as is expected, but that is a possible race condition.
Improves test run time on my machine from 0m3.141s to 0m0.356s.
PR-URL: #2429
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent 11d1b8f commit b60e690
1 file changed
Lines changed: 14 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -16,14 +16,22 @@ var server1 = net.createServer({pauseOnConnect: true}, function(socket) { | |||
| 16 | 16 | }); | |
| 17 | 17 | ||
| 18 | 18 | setTimeout(function() { | |
| 19 | + // After 50(ish) ms, the other socket should have already read the data. | ||
| 20 | + assert.equal(read, true); | ||
| 19 | 21 | assert.equal(socket.bytesRead, 0, 'no data should have been read yet'); | |
| 22 | + | ||
| 20 | 23 | socket.resume(); | |
| 21 | 24 | stopped = false; | |
| 22 | - }, 3000); | ||
| 25 | + }, common.platformTimeout(50)); | ||
| 23 | 26 | }); | |
| 24 | 27 | ||
| 28 | + // read is a timing check, as server1's timer should fire after server2's | ||
| 29 | + // connection receives the data. Note that this could be race-y. | ||
| 30 | + var read = false; | ||
| 25 | 31 | var server2 = net.createServer({pauseOnConnect: false}, function(socket) { | |
| 26 | 32 | socket.on('data', function(data) { | |
| 33 | + read = true; | ||
| 34 | + | ||
| 27 | 35 | assert.equal(data.toString(), msg, 'invalid data received'); | |
| 28 | 36 | socket.end(); | |
| 29 | 37 | server2.close(); | |
@@ -37,3 +45,8 @@ server1.listen(common.PORT, function() { | |||
| 37 | 45 | server2.listen(common.PORT + 1, function() { | |
| 38 | 46 | net.createConnection({port: common.PORT + 1}).write(msg); | |
| 39 | 47 | }); | |
| 48 | + | ||
| 49 | + process.on('exit', function() { | ||
| 50 | + assert.equal(stopped, false); | ||
| 51 | + assert.equal(read, true); | ||
| 52 | + }); | ||
0 commit comments