From 1318998392328495f623f0cde732a7804e0dcfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20=C3=85slund?= Date: Tue, 19 May 2015 21:16:24 +0200 Subject: [PATCH 1/2] Clear error message when smoketest before-hook fails, and fails fast instead of timing out. --- src/_run_server.js | 11 +++++++++-- src/_smoke_test.js | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/_run_server.js b/src/_run_server.js index da376860b..4ea227c43 100644 --- a/src/_run_server.js +++ b/src/_run_server.js @@ -10,13 +10,20 @@ return run("inherit"); }; - exports.runProgrammatically = function(callback) { - var serverProcess = run(["pipe", "pipe", process.stderr]); + exports.runProgrammatically = function(callback, errorCallback) { + var serverProcess = run(["pipe", "pipe", "pipe"]); serverProcess.stdout.setEncoding("utf8"); serverProcess.stdout.on("data", function(chunk) { if (chunk.trim().indexOf("Server started") !== -1) callback(serverProcess); }); + + serverProcess.stderr.setEncoding("utf8"); + serverProcess.stderr.on("data", function(chunk) { + var proc = parseProcFile(); + var error = new Error("Spawning '" + proc.command + " " + proc.options + "' failed."); + errorCallback(error); + }); }; function run(stdioOptions) { diff --git a/src/_smoke_test.js b/src/_smoke_test.js index 1fdd33650..d6390fc31 100644 --- a/src/_smoke_test.js +++ b/src/_smoke_test.js @@ -23,7 +23,6 @@ before(function (done) { runServer.runProgrammatically(function(process) { serverProcess = process; - driver = new firefox.Driver(); driver.getCapabilities().then(function(capabilities) { var version = capabilities.get("browserName") + " " + capabilities.get("version"); @@ -32,10 +31,12 @@ } done(); }); - }); + }, done); }); after(function(done) { + if (serverProcess === undefined) + return done(); serverProcess.on("exit", function(code, signal) { driver.quit().then(done); }); From ce5d033dafc28a2e0e3b0365d38c75134c31dee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20=C3=85slund?= Date: Wed, 28 Jan 2015 17:38:07 +0100 Subject: [PATCH 2/2] Ignoring Sublime editor project files --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 3413c2ff7..90c6a0d77 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,9 @@ node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_mod # Selenium WebDriverJS: Optional dependencies that don't build on vanilla Windows node_modules/selenium-webdriver/node_modules/ws/node_modules/bufferutil/ node_modules/selenium-webdriver/node_modules/ws/node_modules/utf-8-validate/ + + + +# Maas Sublime ignores +*.sublime-project +*.sublime-workspace