From dd54c25541fcb9809d0340d209893af4633632bd Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 10 Jun 2015 11:45:40 -0600 Subject: [PATCH] Fix tests to wait for server launch test stub to finish starting --- ass-stubs/server-test.js | 2 +- test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ass-stubs/server-test.js b/ass-stubs/server-test.js index 1c3c462..d8f548b 100644 --- a/ass-stubs/server-test.js +++ b/ass-stubs/server-test.js @@ -1,5 +1,5 @@ // We don't require ass because we can't test a majority of the server reliably. //require('ass'); require('../server.js'); -console.log('done'); +console.log('ready'); process.on('SIGTERM', function() { process.exit(0); }); diff --git a/test.js b/test.js index 5d88168..5aec33e 100644 --- a/test.js +++ b/test.js @@ -74,7 +74,7 @@ describe('the server', function() { server = cproc.spawn('node', ['ass-stubs/server-test.js', port]); var isDone = false; server.stdout.on('data', function(data) { - if (!isDone) { done(); isDone = true; } + if (data.toString().indexOf('ready') >= 0 && !isDone) { done(); isDone = true; } }); server.stderr.on('data', function(data) { console.log(''+data); }); });