add test to verify number of retries

Author: cebe

Connection.php

@@ -660,17 +660,17 @@ public function executeCommand($name, $params = [])
         \Yii::trace("Executing Redis Command: {$name}", __METHOD__);
         if ($this->retries > 0) {
             $tries = $this->retries;
-            while ($tries-- >= 0) {
+            while ($tries-- > 0) {
                 try {
                     return $this->sendCommandInternal($command, $params);
                 } catch (SocketException $e) {
+                    \Yii::error($e, __METHOD__);
                     // backup retries, fail on commands that fail inside here
                     $retries = $this->retries;
                     $this->retries = 0;
                     $this->close();
                     $this->open();
                     $this->retries = $retries;
-                    \Yii::error($e, __METHOD__);
                 }
             }
         }

tests/RedisConnectionTest.php

@@ -1,6 +1,11 @@
 <?php
 
 namespace yiiunit\extensions\redis;
+use Yii;
+use yii\helpers\ArrayHelper;
+use yii\log\Logger;
+use yii\redis\Connection;
+use yii\redis\SocketException;
 
 /**
  * @group redis
@@ -101,20 +106,68 @@ public function testConnectionTimeout()
         sleep(1);
         $this->assertTrue($db->ping());
         sleep(2);
-        $this->expectException('\yii\redis\SocketException');
+        if (method_exists($this, 'setExpectedException')) {
+            $this->setExpectedException('\yii\redis\SocketException');
+        } else {
+            $this->expectException('\yii\redis\SocketException');
+        }
         $this->assertTrue($db->ping());
     }
 
     public function testConnectionTimeoutRetry()
     {
+        $logger = new Logger();
+        Yii::setLogger($logger);
+
         $db = $this->getConnection(false);
         $db->retries = 1;
         $db->configSet('timeout', 1);
+        $this->assertCount(3, $logger->messages, 'log of connection and init commands.');
+
         $this->assertTrue($db->ping());
-        sleep(1);
+        $this->assertCount(4, $logger->messages, 'log +1 ping command.');
+        usleep(500000); // 500ms
+
         $this->assertTrue($db->ping());
+        $this->assertCount(5, $logger->messages, 'log +1 ping command.');
         sleep(2);
+
+        // reconnect should happen here
+
         $this->assertTrue($db->ping());
+        $this->assertCount(11, $logger->messages, 'log +1 ping command, and reconnection.'
+            . print_r(array_map(function($s) { return (string) $s; }, ArrayHelper::getColumn($logger->messages, 0)), true));
+    }
+
+    /**
+     * Retry connecting 2 times
+     */
+    public function testConnectionTimeoutRetryCount()
+    {
+        $logger = new Logger();
+        Yii::setLogger($logger);
+
+        $db = $this->getConnection(false);
+        $db->retries = 2;
+        $db->configSet('timeout', 1);
+        $db->on(Connection::EVENT_AFTER_OPEN, function() {
+            // sleep 2 seconds after connect to make every command time out
+            sleep(2);
+        });
+        $this->assertCount(3, $logger->messages, 'log of connection and init commands.');
+
+        $exception = false;
+        try {
+            // should try to reconnect 2 times, before finally failing
+            // results in 3 times sending the PING command to redis
+            sleep(2);
+            $db->ping();
+        } catch (SocketException $e) {
+            $exception = true;
+        }
+        $this->assertTrue($exception, 'SocketException should have been thrown.');
+        $this->assertCount(14, $logger->messages, 'log +1 ping command, and reconnection.'
+            . print_r(array_map(function($s) { return (string) $s; }, ArrayHelper::getColumn($logger->messages, 0)), true));
     }
 
     /**