Fix tests

Author: flippmoke

test/connection.spec.js

@@ -395,20 +395,38 @@ describe('connection tests', function () {
                     });
                 });
 
-                it('clears the socket timeout after a connection has been established', function (done) {
+                it('clears connect_timeout on the socket timeout after a connection has been established', function (done) {
                     client = redis.createClient({
                         parser: parser,
                         connect_timeout: 1000
                     });
                     process.nextTick(function () {
                         assert.strictEqual(client.stream._idleTimeout, 1000);
+
                     });
                     client.on('connect', function () {
                         assert.strictEqual(client.stream._idleTimeout, -1);
                         assert.strictEqual(client.stream.listeners('timeout').length, 0);
                         client.on('ready', done);
                     });
                 });
+                
+                it('set the timeout to socket_timeout after a connection has been established', function (done) {
+                    client = redis.createClient({
+                        parser: parser,
+                        connect_timeout: 1000,
+                        socket_timeout: 2000
+                    });
+                    process.nextTick(function () {
+                        assert.strictEqual(client.stream._idleTimeout, 1000);
+
+                    });
+                    client.on('connect', function () {
+                        assert.strictEqual(client.stream._idleTimeout, 2000);
+                        assert.strictEqual(client.stream.listeners('timeout').length, 1);
+                        client.on('ready', done);
+                    });
+                });
 
                 it('connect with host and port provided in the options object', function (done) {
                     client = redis.createClient({

test/node_redis.spec.js

@@ -359,7 +359,7 @@ describe('The node_redis client', function () {
 
                     it('send_command with callback as args', function (done) {
                         client.send_command('abcdef', function (err, res) {
-                            assert.strictEqual(err.message, "ERR unknown command 'abcdef'");
+                            assert.strictEqual(err.message, "ERR unknown command `abcdef`, with args beginning with: ");
                             done();
                         });
                     });

test/rename.spec.js

@@ -50,7 +50,7 @@ describe('rename commands', function () {
                 });
 
                 client.get('key', function (err, reply) {
-                    assert.strictEqual(err.message, "ERR unknown command 'get'");
+                    assert.strictEqual(err.message, "ERR unknown command `get`, with args beginning with: `key`, ");
                     assert.strictEqual(err.command, 'GET');
                     assert.strictEqual(reply, undefined);
                 });
@@ -108,7 +108,7 @@ describe('rename commands', function () {
                 multi.exec(function (err, res) {
                     assert(err);
                     assert.strictEqual(err.message, 'EXECABORT Transaction discarded because of previous errors.');
-                    assert.strictEqual(err.errors[0].message, "ERR unknown command 'get'");
+                    assert.strictEqual(err.errors[0].message, "ERR unknown command `get`, with args beginning with: `key`, ");
                     assert.strictEqual(err.errors[0].command, 'GET');
                     assert.strictEqual(err.code, 'EXECABORT');
                     assert.strictEqual(err.errors[0].code, 'ERR');