slight refactor from code review

smoke test large list of commands ported more tests to mocha, some slight cleanup in tests move sinon and uuid to dev dependencies finished porting eval tests over to mocha rebased mocha testing branch with master ported client and script tests ported watch tests ported detect_buffers tests ported unref tests ported auth tests over to mocha ported idle and no_delay tests ported hlen, hset continuing marching forward ported hincrby, sinter, sort, pubsub tests. improved logic in redis-process, I was still occasionally having issues where redis failed to exit. switch back to default test command ported del, exists, hlen, keys, randomkey, type cleanup based on what I've learned so far from refactor. we now start and stop redis less often. moved tests to their final resting place finished porting node_redis client tests ported hgetall, mget, msetnx, rename, renamenx, setex, setnx ported hgetall, mget, msetnx, rename, renamenx, setex, setnx ported queue tests to mocha amalgamated some of the helper logic ported sadd, scard, sismember, srem, utf-8
2025-08-06 02:15:48 +03:00 · 2015-07-22 20:59:08 -07:00
parent 04fe11b0f5
commit a0832c3744
54 changed files with 3013 additions and 2593 deletions
--- a/test/helper.js
+++ b/test/helper.js
@@ -0,0 +1,100 @@
+var assert = require("assert");
+var path = require('path');
+var RedisProcess = require("./lib/redis-process");
+var rp;
+
+// don't start redis every time we
+// include this helper file!
+if (!process.env.REDIS_TESTS_STARTED) {
+  process.env.REDIS_TESTS_STARTED = true;
+
+  before(function (done) {
+      startRedis('./conf/redis.conf', done);
+  })
+
+  after(function (done) {
+      if (rp) rp.stop(done);
+  });
+}
+
+module.exports = {
+    stopRedis: function (done) {
+        rp.stop(done);
+    },
+    startRedis: function (conf, done) {
+        startRedis(conf, done);
+    },
+    isNumber: function (expected, done) {
+        return function (err, results) {
+            assert.strictEqual(null, err, "expected " + expected + ", got error: " + err);
+            assert.strictEqual(expected, results, expected + " !== " + results);
+            assert.strictEqual(typeof results, "number", "expected a number, got " + typeof results);
+            if (done) return done();
+        };
+    },
+    isString: function (str, done) {
+        return function (err, results) {
+            assert.strictEqual(null, err, "expected string '" + str + "', got error: " + err);
+            assert.equal(str, results, str + " does not match " + results);
+            if (done) return done();
+        };
+    },
+    isNull: function (done) {
+        return function (err, results) {
+            assert.strictEqual(null, err, "expected null, got error: " + err);
+            assert.strictEqual(null, results, results + " is not null");
+            if (done) return done();
+        };
+    },
+    isError: function (done) {
+        return function (err, results) {
+            assert.notEqual(err, null, "err is null, but an error is expected here.");
+            if (done) return done();
+        };
+    },
+    isNotError: function (done) {
+        return function (err, results) {
+            assert.strictEqual(err, null, "expected success, got an error: " + err);
+            if (done) return done();
+        };
+    },
+    isType: {
+        number: function (done) {
+            return function (err, results) {
+                assert.strictEqual(null, err, "expected any number, got error: " + err);
+                assert.strictEqual(typeof results, "number", results + " is not a number");
+                if (done) return done();
+            };
+        },
+        positiveNumber: function (done) {
+            return function (err, results) {
+                assert.strictEqual(null, err, "expected positive number, got error: " + err);
+                assert.strictEqual(true, (results > 0), results + " is not a positive number");
+                if (done) return done();
+            };
+        }
+    },
+    match: function (pattern, done) {
+        return function (err, results) {
+            assert.strictEqual(null, err, "expected " + pattern.toString() + ", got error: " + err);
+            assert(pattern.test(results), "expected string '" + results + "' to match " + pattern.toString());
+            if (done) return done();
+        };
+    },
+    serverVersionAtLeast: function (connection, desired_version) {
+        // Return true if the server version >= desired_version
+        var version = connection.server_info.versions;
+        for (var i = 0; i < 3; i++) {
+            if (version[i] > desired_version[i]) return true;
+            if (version[i] < desired_version[i]) return false;
+        }
+        return true;
+    }
+}
+
+function startRedis (conf, done) {
+    RedisProcess.start(function (err, _rp) {
+        rp = _rp;
+        return done(err);
+    }, path.resolve(__dirname, conf));
+}