redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Fix some tests and deactivate broken ones

Browse Source
This commit is contained in:
Ruben Bridgewater
2015-09-01 21:47:15 +02:00
parent ba779ac361
commit 1ae280dcec
6 changed files with 14 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/commands/hmget.spec.js
View File

@@ -18,8 +18,7 @@ describe("The 'hmget' method", function () {
client.once("error", done); client.once("error", done);
client.once("connect", function () { client.once("connect", function () {
client.flushdb(); client.flushdb();
client.HMSET(hash, {"0123456789": "abcdefghij", "some manner of key": "a type of value"}, helper.isString('OK')); client.HMSET(hash, {"0123456789": "abcdefghij", "some manner of key": "a type of value"}, helper.isString('OK', done));
return done();
}); });
}); });

31
test/commands/mset.spec.js
View File

@@ -60,9 +60,13 @@ describe("The 'mset' method", function () {
describe("and a callback is specified", function () { describe("and a callback is specified", function () {
describe("with valid parameters", function () { describe("with valid parameters", function () {
it("sets the value correctly", function (done) { it("sets the value correctly", function (done) {
client.mset(key, value, key2, value2); client.mset(key, value, key2, value2, function(err) {
client.get(key, helper.isString(value)); if (err) {
client.get(key2, helper.isString(value2, done)); return done(err);
}
client.get(key, helper.isString(value));
client.get(key2, helper.isString(value2, done));
});
}); });
}); });
@@ -75,14 +79,6 @@ describe("The 'mset' method", function () {
}); });
}); });
describe("with undefined 'key' and defined 'value' parameters", function () {
it("reports an error", function () {
client.mset(undefined, value, undefined, value2, function (err, res) {
helper.isError()(err, null);
done();
});
});
});
}); });
describe("and no callback is specified", function () { describe("and no callback is specified", function () {
@@ -108,19 +104,6 @@ describe("The 'mset' method", function () {
client.mset(); client.mset();
}); });
}); });
describe("with undefined 'key' and defined 'value' parameters", function () {
it("throws an error", function () {
var mochaListener = helper.removeMochaListener();
process.once('uncaughtException', function (err) {
process.on('uncaughtException', mochaListener);
helper.isError()(err, null);
});
client.mset(undefined, value, undefined, value2);
});
});
}); });
}); });
}); });

22
test/commands/set.spec.js
View File

@@ -76,15 +76,6 @@ describe("The 'set' method", function () {
}); });
}); });
}); });
describe("with undefined 'key' and defined 'value' parameters", function () {
it("reports an error", function () {
client.set(undefined, value, function (err, res) {
helper.isError()(err, null);
done();
});
});
});
}); });
describe("and no callback is specified", function () { describe("and no callback is specified", function () {
@@ -132,19 +123,6 @@ describe("The 'set' method", function () {
}, 100); }, 100);
}); });
}); });
describe("with undefined 'key' and defined 'value' parameters", function () {
it("throws an error", function () {
var mochaListener = helper.removeMochaListener();
process.once('uncaughtException', function (err) {
process.on('uncaughtException', mochaListener);
helper.isError()(err, null);
});
client.set(undefined, value);
});
});
}); });
}); });
}); });

1
test/commands/setnx.spec.js
View File

@@ -28,7 +28,6 @@ describe("The 'setnx' method", function () {
client.set('foo', 'bar', helper.isString('OK')); client.set('foo', 'bar', helper.isString('OK'));
client.setnx('foo', 'banana', helper.isNumber(0)); client.setnx('foo', 'banana', helper.isNumber(0));
client.get('foo', helper.isString('bar', done)); client.get('foo', helper.isString('bar', done));
return done();
}); });
afterEach(function () { afterEach(function () {

2
test/helper.js
View File

@@ -58,7 +58,7 @@ module.exports = {
}, },
isError: function (done) { isError: function (done) {
return function (err, results) { return function (err, results) {
assert.notEqual(err, null, "err is null, but an error is expected here."); assert(err instanceof Error, "err is not instance of 'Error', but an error is expected here.");
if (done) return done(); if (done) return done();
}; };
}, },

48
test/node_redis.spec.js
View File

@@ -188,15 +188,12 @@ describe("The node_redis client", function () {
// Does not pass. // Does not pass.
// "Connection in subscriber mode, only subscriber commands may be used" // "Connection in subscriber mode, only subscriber commands may be used"
it("reconnects, unsubscribes, and can retrieve the pre-existing data", function (done) { it("reconnects, unsubscribes, and can retrieve the pre-existing data", function (done) {
client.on("reconnecting", function on_recon(params) { client.on("ready", function on_connect() {
client.on("ready", function on_connect() { client.unsubscribe(helper.isNotError());
client.unsubscribe(helper.isNotError());
client.on('unsubscribe', function (channel, count) { client.on('unsubscribe', function (channel, count) {
// we should now be out of subscriber mode. // we should now be out of subscriber mode.
client.set('foo', 'bar', helper.isNumber(1)); client.set('foo', 'bar', helper.isString('OK', done));
return done();
});
}); });
}); });
@@ -207,41 +204,6 @@ describe("The node_redis client", function () {
client.stream.destroy(); client.stream.destroy();
}); });
}); });
it("remains subscribed", function () {
var client2 = redis.createClient.apply(redis.createClient, args);
client.on("reconnecting", function on_recon(params) {
client.on("ready", function on_connect() {
async.parallel([function (cb) {
client.on("message", function (channel, message) {
try {
helper.isString("recon channel")(null, channel);
helper.isString("a test message")(null, message);
} catch (err) {
cb(err);
}
});
client2.subscribe("recon channel", function (err, res) {
if (err) {
cb(err);
return;
}
client2.publish("recon channel", "a test message");
});
}], function (err, results) {
done(err);
});
});
});
client.subscribe("recon channel", function (err, res) {
// Do not do this in normal programs. This is to simulate the server closing on us.
// For orderly shutdown in normal programs, do client.quit()
client.stream.destroy();
});
});
}); });
describe('domain', function () { describe('domain', function () {