From cbf663be81970f6afaef08b151ce925701cff0a3 Mon Sep 17 00:00:00 2001 From: Naomi Seyfer Date: Tue, 26 Feb 2013 15:50:25 -0800 Subject: [PATCH] Test runner handles double finish --- packages/test-in-phantom/driver.js | 12 +++++++++--- packages/test-in-phantom/run.sh | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/test-in-phantom/driver.js b/packages/test-in-phantom/driver.js index 72809b3a58..2bb9e8b0f9 100644 --- a/packages/test-in-phantom/driver.js +++ b/packages/test-in-phantom/driver.js @@ -28,17 +28,23 @@ Meteor._runTestsEverywhere( resultSet[name].status = "EXPECTED"; break; case "finish": - if (resultSet[name].status === "PENDING") { + switch (resultSet[name].status) { + case "OK": + break; + case "PENDING": resultSet[name].status = "OK"; console.log(name, ":", "OK"); passed++; - } else if (resultSet[name].status === "EXPECTED") { + break; + case "EXPECTED": console.log(name, ":", "EXPECTED FAILURE"); expected++; - } else { + break; + default: failed++; console.log(name, ":", "!!!!!!!!! FAIL !!!!!!!!!!!"); console.log(JSON.stringify(resultSet[name].info)); + break; } finished++; break; diff --git a/packages/test-in-phantom/run.sh b/packages/test-in-phantom/run.sh index e3c850dbb5..4e3d959529 100755 --- a/packages/test-in-phantom/run.sh +++ b/packages/test-in-phantom/run.sh @@ -5,7 +5,7 @@ cd $METEOR_HOME/packages meteor --tests=test-in-phantom & METEOR_PID=$! -sleep 1 +sleep 2 phantomjs ./test-in-phantom/runner.js