Add cluster specific testInfo() method

michael-grunder · michael-grunder · commit 88530eed4a00 · 2015-05-05T15:16:49.000-07:00
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -2338,10 +2338,10 @@ static void cluster_raw_cmd(INTERNAL_FUNCTION_PARAMETERS, char *kw, int kw_len)
     }
 
     /* Initialize our command */
-    redis_cmd_init_sstr(&cmd, argc, kw, kw_len);
+    redis_cmd_init_sstr(&cmd, argc-1, kw, kw_len);
 
     /* Iterate, appending args */
-    for(i=0;i<argc;i++) {
+    for(i=1;i<argc;i++) {
         convert_to_string(z_args[i]);
         redis_cmd_append_sstr(&cmd, Z_STRVAL_P(z_args[i]), 
             Z_STRLEN_P(z_args[i]));
diff --git a/tests/RedisClusterTest.php b/tests/RedisClusterTest.php
@@ -9,6 +9,15 @@
 class Redis_Cluster_Test extends Redis_Test {
     private $_arr_node_map = Array();
 
+    /* Tests we'll skip all together in the context of RedisCluster.  The 
+     * RedisCluster class doesn't implement specialized (non-redis) commands
+     * such as sortAsc, or sortDesc and other commands such as SELECT are
+     * simply invalid in Redis Cluster */
+    public function testSortAsc()  { return $this->markTestSkipped(); }
+    public function testSortDesc() { return $this->markTestSkipped(); }
+    public function testWait()     { return $this->markTestSkipped(); }
+    public function testSelect()   { return $this->markTestSkipped(); }
+
     /* Load our seeds on construction */
     public function __construct() {
         $str_nodemap_file = dirname($_SERVER['PHP_SELF']) . '/nodes/nodemap';
@@ -59,9 +68,6 @@ public function testEcho() {
         $this->assertEquals($this->redis->echo('k3', " 0123 "), " 0123 ");
     }
 
-    public function testSortAsc()  { return $this->markTestSkipped(); }
-    public function testSortDesc() { return $this->markTestSkipped(); }
-
     public function testSortPrefix() {
         $this->redis->setOption(Redis::OPT_PREFIX, 'some-prefix:');
         $this->redis->del('some-item');
@@ -85,5 +91,21 @@ public function testDBSize() {
         }
     }
 
+    public function testInfo() {
+        $arr_check_keys = Array(
+            "redis_version", "arch_bits", "uptime_in_seconds", "uptime_in_days",
+            "connected_clients", "connected_slaves", "used_memory",
+            "total_connections_received", "total_commands_processed",
+            "role"
+        );
+
+        for ($i = 0; $i < 3; $i++) {
+            $arr_info = $this->redis->info("k:$i");
+            foreach ($arr_check_keys as $str_check_key) {
+                $this->assertTrue(isset($arr_info[$str_check_key]));
+            }
+        }
+    }
+
 }
 ?>
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -1810,36 +1810,37 @@ public function testWait() {
     }
 
     public function testinfo() {
-    $info = $this->redis->info();
-
-    $keys = array(
-        "redis_version",
-        "arch_bits",
-        "uptime_in_seconds",
-        "uptime_in_days",
-        "connected_clients",
-        "connected_slaves",
-        "used_memory",
-        "total_connections_received",
-        "total_commands_processed",
-        "role");
-    if (version_compare($this->version, "2.5.0", "lt")) {
-        array_push($keys,
-            "changes_since_last_save",
-            "bgsave_in_progress",
-            "last_save_time"
-        );
-    } else {
-        array_push($keys,
-            "rdb_changes_since_last_save",
-            "rdb_bgsave_in_progress",
-            "rdb_last_save_time"
-        );
-    }
+        $info = $this->redis->info();
 
-    foreach($keys as $k) {
-        $this->assertTrue(in_array($k, array_keys($info)));
-    }
+        $keys = array(
+            "redis_version",
+            "arch_bits",
+            "uptime_in_seconds",
+            "uptime_in_days",
+            "connected_clients",
+            "connected_slaves",
+            "used_memory",
+            "total_connections_received",
+            "total_commands_processed",
+            "role"
+        );
+        if (version_compare($this->version, "2.5.0", "lt")) {
+            array_push($keys,
+                "changes_since_last_save",
+                "bgsave_in_progress",
+                "last_save_time"
+            );
+        } else {
+            array_push($keys,
+                "rdb_changes_since_last_save",
+                "rdb_bgsave_in_progress",
+                "rdb_last_save_time"
+            );
+        }
+        
+        foreach($keys as $k) {
+            $this->assertTrue(in_array($k, array_keys($info)));
+        }
     }
 
     public function testInfoCommandStats() {
@@ -1860,8 +1861,8 @@ public function testInfoCommandStats() {
     }
 
     public function testSelect() {
-    $this->assertFalse($this->redis->select(-1));
-    $this->assertTrue($this->redis->select(0));
+        $this->assertFalse($this->redis->select(-1));
+        $this->assertTrue($this->redis->select(0));
     }
 
     public function testMset() {
