Merge pull request #837 from NodeRedis/windows-tests

retrofit tests so that they work on Windows

Author: bcoe

README.md

@@ -3,6 +3,7 @@ redis - a node.js redis client
 
 [![Build Status](https://travis-ci.org/NodeRedis/node_redis.png)](https://travis-ci.org/NodeRedis/node_redis)
 [![Coverage Status](https://coveralls.io/repos/NodeRedis/node_redis/badge.svg?branch=)](https://coveralls.io/r/NodeRedis/node_redis?branch=)
+[![Windows Tests](https://img.shields.io/appveyor/ci/bcoe/node-redis/master.svg?label=Windows%20Tests)](https://ci.appveyor.com/project/bcoe/node-redis)
 
 This is a complete Redis client for node.js. It supports all Redis commands,
 including many recently added commands.

appveyor.yml

@@ -0,0 +1,38 @@
+# http://www.appveyor.com/docs/appveyor-yml
+
+# Test against these versions of Node.js.
+environment:
+  matrix:
+    - nodejs_version: "0.10"
+    - nodejs_version: "0.12"
+    - nodejs_version: "3.0"
+    - nodejs_version: "4.0"
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Install the Redis
+  - nuget install redis-64 -excludeversion
+  - redis-64\redis-server.exe --service-install
+  - redis-64\redis-server.exe --service-start
+  - '@ECHO Redis Started'
+  # Get the latest stable version of Node 0.STABLE.latest
+  - ps: Install-Product node $env:nodejs_version
+  # Typical npm stuff.
+  - npm install
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  - cmd: npm t
+
+os:
+  - Default Azure
+  - Windows Server 2012 R2
+
+# Don't actually build using MSBuild
+build: off
+
+# Set build version format here instead of in the admin panel.
+version: "{build}"

package.json

@@ -12,18 +12,20 @@
   "scripts": {
     "coveralls": "nyc report --reporter=text-lcov | coveralls",
     "coverage": "nyc report --reporter=html",
-    "test": "./node_modules/.bin/jshint * && nyc ./node_modules/.bin/_mocha ./test/*.js ./test/commands/*.js ./test/parser/*.js --timeout=8000",
-    "jshint": "./node_modules/.bin/jshint *"
+    "test": "nyc ./node_modules/.bin/_mocha ./test/*.js ./test/commands/*.js ./test/parser/*.js --timeout=8000",
+    "pretest": "optional-dev-dependency hiredis",
+    "posttest": "jshint ."
   },
   "devDependencies": {
     "coveralls": "^2.11.2",
-    "hiredis": "^0.4.1",
     "jshint": "^2.8.0",
     "metrics": ">=0.1.5",
     "mocha": "^2.2.5",
-    "nyc": "^3.0.0",
+    "nyc": "^3.2.2",
+    "optional-dev-dependency": "^1.0.1",
     "tcp-port-used": "^0.1.2",
-    "uuid": "^2.0.1"
+    "uuid": "^2.0.1",
+    "win-spawn": "^2.0.0"
   },
   "repository": {
     "type": "git",

test/auth.spec.js

@@ -24,6 +24,8 @@ describe("client authentication", function () {
             });
 
             it("allows auth to be provided with 'auth' method", function (done) {
+                if (helper.redisProcess().spawnFailed()) this.skip();
+
                 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) {
+                if (helper.redisProcess().spawnFailed()) this.skip();
+
                 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) {
+                    if (helper.redisProcess().spawnFailed()) this.skip();
+
                     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) {
+                if (helper.redisProcess().spawnFailed()) this.skip();
+
                 var args = config.configureClient(parser, ip, {
                     auth_pass: auth
                 });
@@ -62,7 +70,20 @@ describe("client authentication", function () {
                 });
             });
 
+            it('allows auth to be provided post-hoc with auth method', function (done) {
+                if (helper.redisProcess().spawnFailed()) this.skip();
+
+                var args = config.configureClient(parser, ip);
+                client = redis.createClient.apply(redis.createClient, args);
+                client.auth(auth);
+                client.on("ready", function () {
+                    return done();
+                });
+            });
+
             it('reconnects with appropriate authentication', function (done) {
+                if (helper.redisProcess().spawnFailed()) this.skip();
+
                 var readyCount = 0;
                 client = redis.createClient.apply(redis.createClient, args);
                 client.auth(auth);

test/commands/client.spec.js

@@ -17,12 +17,7 @@ describe("The 'client' method", function () {
                 client = redis.createClient.apply(redis.createClient, args);
                 client.once("error", done);
                 client.once("connect", function () {
-                    client.flushdb(function (err) {
-                        if (!helper.serverVersionAtLeast(client, [2, 4, 0])) {
-                          err = Error('script not supported in redis <= 2.4.0');
-                        }
-                        return done(err);
-                    });
+                    client.flushdb(done);
                 });
             });
 

test/commands/dbsize.spec.js

@@ -34,7 +34,7 @@ describe("The 'dbsize' method", function () {
 
                 it("reports an error", function (done) {
                     client.dbsize([], function (err, res) {
-                        assert.equal(err.message, 'Redis connection gone from end event.');
+                        assert(err.message.match(/Redis connection gone/));
                         done();
                     });
                 });

test/commands/eval.spec.js

@@ -17,12 +17,7 @@ describe("The 'eval' method", function () {
                 client = redis.createClient.apply(redis.createClient, args);
                 client.once("error", done);
                 client.once("connect", function () {
-                    client.flushdb(function (err) {
-                        if (!helper.serverVersionAtLeast(client, [2, 5, 0])) {
-                          err = Error('exec not supported in redis <= 2.5.0');
-                        }
-                        return done(err);
-                    });
+                    client.flushdb(done);
                 });
             });
 
@@ -31,30 +26,37 @@ describe("The 'eval' method", function () {
             });
 
             it('converts a float to an integer when evaluated', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.eval("return 100.5", 0, helper.isNumber(100, done));
             });
 
             it('returns a string', function (done) {
-                client.EVAL("return 'hello world'", 0, helper.isString('hello world', done));
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
+                client.eval("return 'hello world'", 0, helper.isString('hello world', done));
             });
 
             it('converts boolean true to integer 1', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.eval("return true", 0, helper.isNumber(1, done));
             });
 
             it('converts boolean false to null', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.eval("return false", 0, helper.isNull(done));
             });
 
             it('converts lua status code to string representation', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.eval("return {ok='fine'}", 0, helper.isString('fine', done));
             });
 
             it('converts lua error to an error response', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.eval("return {err='this is an error'}", 0, helper.isError(done));
             });
 
             it('represents a lua table appropritely', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.eval("return {1,2,3,'ciao',{1,2}}", 0, function (err, res) {
                     assert.strictEqual(5, res.length);
                     assert.strictEqual(1, res[0]);
@@ -69,25 +71,27 @@ describe("The 'eval' method", function () {
             });
 
             it('populates keys and argv correctly', function (done) {
-              client.eval("return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}", 2, "a", "b", "c", "d", function (err, res) {
-                  assert.strictEqual(4, res.length);
-                  assert.strictEqual("a", res[0]);
-                  assert.strictEqual("b", res[1]);
-                  assert.strictEqual("c", res[2]);
-                  assert.strictEqual("d", res[3]);
-                  return done();
-              });
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
+                client.eval("return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}", 2, "a", "b", "c", "d", function (err, res) {
+                    assert.strictEqual(4, res.length);
+                    assert.strictEqual("a", res[0]);
+                    assert.strictEqual("b", res[1]);
+                    assert.strictEqual("c", res[2]);
+                    assert.strictEqual("d", res[3]);
+                    return done();
+                });
             });
 
             it('allows arguments to be provided in array rather than as multiple parameters', function (done) {
-              client.eval(["return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}", 2, "a", "b", "c", "d"], function (err, res) {
-                  assert.strictEqual(4, res.length);
-                  assert.strictEqual("a", res[0]);
-                  assert.strictEqual("b", res[1]);
-                  assert.strictEqual("c", res[2]);
-                  assert.strictEqual("d", res[3]);
-                  return done();
-              });
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
+                client.eval(["return {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}", 2, "a", "b", "c", "d"], function (err, res) {
+                    assert.strictEqual(4, res.length);
+                    assert.strictEqual("a", res[0]);
+                    assert.strictEqual("b", res[1]);
+                    assert.strictEqual("c", res[2]);
+                    assert.strictEqual("d", res[3]);
+                    return done();
+                });
             });
 
             describe('evalsha', function () {
@@ -101,19 +105,23 @@ describe("The 'eval' method", function () {
                 });
 
                 it('allows a script to be executed that accesses the redis API', function (done) {
+                    helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                     client.eval(source, 0, helper.isString('eval get sha test', done));
                 });
 
                 it('can execute a script if the SHA exists', function (done) {
+                    helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                     client.evalsha(sha, 0, helper.isString('eval get sha test', done));
                 });
 
                 it('throws an error if SHA does not exist', function (done) {
+                    helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                     client.evalsha('ffffffffffffffffffffffffffffffffffffffff', 0, helper.isError(done));
                 });
             });
 
             it('allows a key to be incremented, and performs appropriate conversion from LUA type', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.set("incr key", 0, function (err, reply) {
                     if (err) return done(err);
                     client.eval("local foo = redis.call('incr','incr key')\n" + "return {type(foo),foo}", 0, function (err, res) {
@@ -126,6 +134,7 @@ describe("The 'eval' method", function () {
             });
 
             it('allows a bulk operation to be performed, and performs appropriate conversion from LUA type', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.set("bulk reply key", "bulk reply value", function (err, res) {
                     client.eval("local foo = redis.call('get','bulk reply key'); return {type(foo),foo}", 0, function (err, res) {
                         assert.strictEqual(2, res.length);
@@ -137,6 +146,7 @@ describe("The 'eval' method", function () {
             });
 
             it('allows a multi mulk operation to be performed, with the appropriate type conversion', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.multi()
                     .del("mylist")
                     .rpush("mylist", "a")
@@ -157,6 +167,7 @@ describe("The 'eval' method", function () {
             });
 
             it('returns an appropriate representation of Lua status reply', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.eval("local foo = redis.call('set','mykey','myval'); return {type(foo),foo['ok']}", 0, function (err, res) {
                     assert.strictEqual(2, res.length);
                     assert.strictEqual("table", res[0]);
@@ -166,6 +177,7 @@ describe("The 'eval' method", function () {
             });
 
             it('returns an appropriate representation of a Lua error reply', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.set("error reply key", "error reply value", function (err, res) {
                     if (err) return done(err);
                     client.eval("local foo = redis.pcall('incr','error reply key'); return {type(foo),foo['err']}", 0, function (err, res) {
@@ -178,6 +190,7 @@ describe("The 'eval' method", function () {
             });
 
             it('returns an appropriate representation of a Lua nil reply', function (done) {
+                helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
                 client.del("nil reply key", function (err, res) {
                     if (err) return done(err);
                     client.eval("local foo = redis.call('get','nil reply key'); return {type(foo),foo == false}", 0, function (err, res) {

test/commands/expire.spec.js

@@ -24,7 +24,7 @@ describe("The 'expire' method", function () {
                 client.EXPIRE(["expiry key", "1"], helper.isNumber(1));
                 setTimeout(function () {
                     client.exists(["expiry key"], helper.isNumber(0, done));
-                }, 1100);
+                }, 3000);
             });
 
             afterEach(function () {

test/commands/flushdb.spec.js

@@ -34,7 +34,7 @@ describe("The 'flushdb' method", function () {
 
                 it("reports an error", function (done) {
                     client.flushdb(function (err, res) {
-                        assert.equal(err.message, 'Redis connection gone from end event.');
+                        assert(err.message.match(/Redis connection gone/));
                         done();
                     });
                 });

test/commands/get.spec.js

@@ -34,7 +34,7 @@ describe("The 'get' method", function () {
 
                 it("reports an error", function (done) {
                     client.get(key, function (err, res) {
-                        assert.equal(err.message, 'Redis connection gone from end event.');
+                        assert(err.message.match(/Redis connection gone/));
                         done();
                     });
                 });