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 error codes for multi.exec and add more tests

Browse Source
This commit is contained in:
Ruben Bridgewater
2015-09-19 18:15:23 +02:00
parent 2293f7ff85
commit 959b0ee093
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@@ -1077,7 +1077,13 @@ Multi.prototype.execute_callback = function (err, replies) {
args = this.queue[i]; args = this.queue[i];
// If we asked for strings, even in detect_buffers mode, then return strings: // If we asked for strings, even in detect_buffers mode, then return strings:
if (reply) { if (reply instanceof Error) {
var match = reply.message.match(err_code);
// LUA script could return user errors that don't behave like all other errors!
if (match) {
reply.code = match[1];
}
} else if (reply) {
if (this._client.options.detect_buffers && this.wants_buffers[i] === false) { if (this._client.options.detect_buffers && this.wants_buffers[i] === false) {
replies[i - 1] = reply = reply_to_strings(reply); replies[i - 1] = reply = reply_to_strings(reply);
} }

8
test/commands/multi.spec.js
View File

@@ -254,6 +254,7 @@ describe("The 'multi' method", function () {
assert(err.message.match(/^EXECABORT/), "Error message should begin with EXECABORT"); assert(err.message.match(/^EXECABORT/), "Error message should begin with EXECABORT");
assert.equal(err.errors.length, 2, "err.errors should have 2 items"); assert.equal(err.errors.length, 2, "err.errors should have 2 items");
assert.strictEqual(err.errors[0].command_used, 'SET'); assert.strictEqual(err.errors[0].command_used, 'SET');
assert.strictEqual(err.errors[0].code, 'ERR');
assert.strictEqual(err.errors[0].position, 1); assert.strictEqual(err.errors[0].position, 1);
assert(/^ERR/.test(err.errors[0].message), "Actuall error message should begin with ERR"); assert(/^ERR/.test(err.errors[0].message), "Actuall error message should begin with ERR");
return done(); return done();
@@ -261,9 +262,11 @@ describe("The 'multi' method", function () {
}); });
it('reports multiple exceptions when they occur (while EXEC is running)', function (done) { it('reports multiple exceptions when they occur (while EXEC is running)', function (done) {
client.multi().config("bar").debug("foo").exec(function (err, reply) { client.multi().config("bar").debug("foo").eval("return {err='this is an error'}", 0).exec(function (err, reply) {
assert.strictEqual(reply.length, 2); assert.strictEqual(reply.length, 3);
assert.equal(reply[0].code, 'ERR'); assert.equal(reply[0].code, 'ERR');
assert.equal(reply[2].code, undefined);
assert(/^this is an error/.test(reply[2].message));
assert(/^ERR/.test(reply[0].message), "Error message should begin with ERR"); assert(/^ERR/.test(reply[0].message), "Error message should begin with ERR");
assert(/^ERR/.test(reply[1].message), "Error message should begin with ERR"); assert(/^ERR/.test(reply[1].message), "Error message should begin with ERR");
return done(); return done();
@@ -276,6 +279,7 @@ describe("The 'multi' method", function () {
multi.set('foo', 'bar', helper.isString('OK')); multi.set('foo', 'bar', helper.isString('OK'));
multi.debug("foo").exec(function (err, reply) { multi.debug("foo").exec(function (err, reply) {
assert.strictEqual(reply.length, 3); assert.strictEqual(reply.length, 3);
assert.strictEqual(reply[0].code, 'ERR');
assert(/^ERR/.test(reply[0].message), "Error message should begin with ERR"); assert(/^ERR/.test(reply[0].message), "Error message should begin with ERR");
assert(/^ERR/.test(reply[2].message), "Error message should begin with ERR"); assert(/^ERR/.test(reply[2].message), "Error message should begin with ERR");
assert.strictEqual(reply[1], "OK"); assert.strictEqual(reply[1], "OK");