Merge branch 'issue.1287' into develop

2 files changed, 10 insertions, 0 deletions

diff --git a/tests/RedisClusterTest.php b/tests/RedisClusterTest.php
index 4e0c15eb..eb364dbc 100644
--- a/tests/RedisClusterTest.php
+++ b/tests/RedisClusterTest.php
@@ -35,6 +35,7 @@ class Redis_Cluster_Test extends Redis_Test {
     public function testMultipleConnect() { return $this->markTestSkipped(); }
     public function testDoublePipeNoOp() { return $this->markTestSkipped(); }
     public function testSwapDB() { return $this->markTestSkipped(); }
+    public function testConnectException() { return $this->markTestSkipped(); }
 
     /* Load our seeds on construction */
     public function __construct() {
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
index 1f29ea62..4c0b7884 100644
--- a/tests/RedisTest.php
+++ b/tests/RedisTest.php
@@ -5162,5 +5162,14 @@ class Redis_Test extends TestSuite
             $this->assertEquals($this->redis->ping(), "+PONG");
         }
     }
+
+    public function testConnectException() {
+        $redis = new Redis();
+        try {
+            $redis->connect('github.com', 6379, 0.01);
+        }  catch (Exception $e) {
+            $this->assertTrue(strpos($e, "timed out") !== false);
+        }
+    }
 }
 ?>