From b7731199671ed463f5660fcc4ba7bec78cd51d41 Mon Sep 17 00:00:00 2001 From: bcoe Date: Sat, 3 Oct 2015 21:28:14 -0700 Subject: [PATCH] the monitor test should not be within the block of tests related to redis closing unexpectedly --- test/node_redis.spec.js | 59 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/test/node_redis.spec.js b/test/node_redis.spec.js index f3df657fa5..cd6659686a 100644 --- a/test/node_redis.spec.js +++ b/test/node_redis.spec.js @@ -355,42 +355,41 @@ describe("The node_redis client", function () { } }); }); + }); - describe('monitor', function () { - it('monitors commands on all other redis clients', function (done) { - helper.serverVersionAtLeast.call(this, client, [2, 6, 0]); + describe('monitor', function () { + it('monitors commands on all other redis clients', function (done) { + helper.serverVersionAtLeast.call(this, client, [2, 6, 0]); - var monitorClient = redis.createClient.apply(redis.createClient, args); - var responses = []; + var monitorClient = redis.createClient.apply(redis.createClient, args); + var responses = []; - monitorClient.monitor(function (err, res) { - client.mget("some", "keys", "foo", "bar"); - client.set("json", JSON.stringify({ - foo: "123", - bar: "sdflkdfsjk", - another: false - })); - }); + monitorClient.monitor(function (err, res) { + client.mget("some", "keys", "foo", "bar"); + client.set("json", JSON.stringify({ + foo: "123", + bar: "sdflkdfsjk", + another: false + })); + }); - monitorClient.on("monitor", function (time, args) { - responses.push(args); - if (responses.length === 2) { - assert.strictEqual(5, responses[0].length); - assert.strictEqual("mget", responses[0][0]); - assert.strictEqual("some", responses[0][1]); - assert.strictEqual("keys", responses[0][2]); - assert.strictEqual("foo", responses[0][3]); - assert.strictEqual("bar", responses[0][4]); - assert.strictEqual(3, responses[1].length); - assert.strictEqual("set", responses[1][0]); - assert.strictEqual("json", responses[1][1]); - assert.strictEqual('{"foo":"123","bar":"sdflkdfsjk","another":false}', responses[1][2]); - monitorClient.quit(done); - } - }); + monitorClient.on("monitor", function (time, args) { + responses.push(args); + if (responses.length === 2) { + assert.strictEqual(5, responses[0].length); + assert.strictEqual("mget", responses[0][0]); + assert.strictEqual("some", responses[0][1]); + assert.strictEqual("keys", responses[0][2]); + assert.strictEqual("foo", responses[0][3]); + assert.strictEqual("bar", responses[0][4]); + assert.strictEqual(3, responses[1].length); + assert.strictEqual("set", responses[1][0]); + assert.strictEqual("json", responses[1][1]); + assert.strictEqual('{"foo":"123","bar":"sdflkdfsjk","another":false}', responses[1][2]); + monitorClient.quit(done); + } }); }); - }); describe('idle', function () {