From b4da9757855e71cf4dda20a4e5c4ec2ab5163da6 Mon Sep 17 00:00:00 2001
From: Benjamin Coe <ben@npmjs.com>
Date: Fri, 11 Sep 2015 23:23:34 -0700
Subject: [PATCH] prep for getting tests to work on appveyor

---
 package.json              |  2 +-
 test/auth.spec.js         | 19 +++++++++++++++++++
 test/helper.js            |  3 +++
 test/lib/redis-process.js | 14 +++++++-------
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 5eee7c6030..0c757198c8 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "jshint": "^2.8.0",
     "metrics": ">=0.1.5",
     "mocha": "^2.2.5",
-    "nyc": "^3.0.0",
+    "nyc": "^3.2.2",
     "tcp-port-used": "^0.1.2",
     "uuid": "^2.0.1"
   },
diff --git a/test/auth.spec.js b/test/auth.spec.js
index c049df5d30..b4a710b846 100644
--- a/test/auth.spec.js
+++ b/test/auth.spec.js
@@ -24,6 +24,8 @@ describe("client authentication", function () {
             });
 
             it("allows auth to be provided with 'auth' method", function (done) {
+                abortOnSpawnFailure(done);
+
                 client = redis.createClient.apply(redis.createClient, args);
                 client.auth(auth, function (err, res) {
                     assert.strictEqual(null, err);
@@ -33,6 +35,8 @@ describe("client authentication", function () {
             });
 
             it("raises error when auth is bad", function (done) {
+                abortOnSpawnFailure(done);
+
                 client = redis.createClient.apply(redis.createClient, args);
 
                 client.once('error', function (error) {
@@ -45,6 +49,8 @@ describe("client authentication", function () {
 
             if (ip === 'IPv4') {
                 it('allows auth to be provided as part of redis url', function (done) {
+                    abortOnSpawnFailure(done);
+
                     client = redis.createClient('redis://foo:' + auth + '@' + config.HOST[ip] + ':' + config.PORT);
                     client.on("ready", function () {
                         return done();
@@ -53,6 +59,8 @@ describe("client authentication", function () {
             }
 
             it('allows auth to be provided as config option for client', function (done) {
+                abortOnSpawnFailure(done);
+
                 var args = config.configureClient(parser, ip, {
                     auth_pass: auth
                 });
@@ -63,6 +71,8 @@ describe("client authentication", function () {
             });
 
             it('reconnects with appropriate authentication', function (done) {
+                abortOnSpawnFailure(done);
+
                 var readyCount = 0;
                 client = redis.createClient.apply(redis.createClient, args);
                 client.auth(auth);
@@ -83,4 +93,13 @@ describe("client authentication", function () {
             helper.startRedis('./conf/redis.conf', done);
         });
     });
+
+    // if we fail to spawn Redis (spawning Redis directly is
+    // not possible in some CI environments) skip the auth tests.
+    function abortOnSpawnFailure (done) {
+        if (helper.redisProcess().spawnFailed()) {
+            console.warn('skipped authentication test')
+            return done();
+        }
+    }
 });
diff --git a/test/helper.js b/test/helper.js
index 0286bc47c3..0c5bf8c5bf 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -28,6 +28,9 @@ if (!process.env.REDIS_TESTS_STARTED) {
 }
 
 module.exports = {
+    redisProcess: function () {
+        return rp;
+    },
     stopRedis: function (done) {
         rp.stop(done);
     },
diff --git a/test/lib/redis-process.js b/test/lib/redis-process.js
index 176aa2e052..298558ff45 100644
--- a/test/lib/redis-process.js
+++ b/test/lib/redis-process.js
@@ -5,6 +5,7 @@ var cp = require('child_process');
 var config = require('./config');
 var fs = require('fs');
 var path = require('path');
+var spawnFailed = false;
 var tcpPortUsed = require('tcp-port-used');
 
 // wait for redis to be listening in
@@ -36,13 +37,8 @@ module.exports = {
         // capture a failure booting redis, and give
         // the user running the test some directions.
         rp.once("exit", function (code) {
-            if (code !== 0) {
-                console.error('failed to starting redis with exit code "' + code + '" ' +
-                  'stop any other redis processes currently running (' +
-                  'hint: lsof -i :6379)');
-                process.exit(code);
-            }
-        });
+            if (code !== 0) spawnFailed = true;
+        })
 
         // wait for redis to become available, by
         // checking the port we bind on.
@@ -50,7 +46,11 @@ module.exports = {
             // return an object that can be used in
             // an after() block to shutdown redis.
             return done(null, {
+                spawnFailed: function () {
+                    return spawnFailed;
+                },
                 stop: function (done) {
+                    if (spawnFailed) return done();
                     rp.once("exit", function (code) {
                         var error = null;
                         if (code !== null && code !== 0) {