Use a static variable for our nodemap file and only open it once

michael-grunder · michael-grunder · commit ab8fa7dad768 · 2015-05-07T15:52:55.000-07:00
to avoid blowing file descriptors.
diff --git a/tests/RedisClusterTest.php b/tests/RedisClusterTest.php
@@ -7,7 +7,7 @@
  * where we're validating specific cluster mechanisms
  */
 class Redis_Cluster_Test extends Redis_Test {
-    private $_arr_node_map = Array();
+    private static $_arr_node_map = Array();
 
     private $_arr_redis_types = Array(
         Redis::REDIS_STRING,
@@ -43,9 +43,11 @@ public function __construct() {
         }
 
         /* Store our node map */
-        $this->_arr_node_map = array_filter(
-            explode("\n", file_get_contents($str_nodemap_file)
-        ));
+        if (!self::$_arr_node_map) {
+            self::$_arr_node_map = array_filter(
+                explode("\n", file_get_contents($str_nodemap_file)
+            ));
+        }
     }
 
     /* Override setUp to get info from a specific node */
@@ -57,7 +59,7 @@ public function setUp() {
 
     /* Override newInstance as we want a RedisCluster object */
     protected function newInstance() {
-        return new RedisCluster(NULL, $this->_arr_node_map);
+        return new RedisCluster(NULL, self::$_arr_node_map);
     }
 
     /* Overrides for RedisTest where the function signature is different.  This
diff --git a/tests/TestSuite.php b/tests/TestSuite.php
@@ -147,10 +147,8 @@ public static function run($className, $str_limit = NULL) {
                 if ($e instanceof RedisException) {
                     $className::$errors[] = "Uncaught exception '".$e->getMessage()."' ($name)\n";
                     $str_msg = self::make_fail('FAILED');
-                    //echo 'F';
                 } else {
                     $str_msg = self::make_warning('SKIPPED');
-                    //echo 'S';
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,8 @@ public static function run($className, $str_limit = NULL) {`
`147`	`147`	`if ($e instanceof RedisException) {`
`148`	`148`	`$className::$errors[] = "Uncaught exception '".$e->getMessage()."' ($name)\n";`
`149`	`149`	`$str_msg = self::make_fail('FAILED');`
`150`		`- //echo 'F';`
`151`	`150`	`} else {`
`152`	`151`	`$str_msg = self::make_warning('SKIPPED');`
`153`		`- //echo 'S';`
`154`	`152`	`}`
`155`	`153`	`}`
`156`	`154`