Adding generated Thrift files + cassandra.thrift. fixed config + Pand…

…raTest
mjpearson · Jan 16, 2010 · f890d00 · f890d00
1 parent 33a065f
commit f890d00
Show file tree

Hide file tree

Showing 22 changed files with 9,360 additions and 3 deletions.
diff --git a/config.php b/config.php
@@ -22,7 +22,7 @@
  *
  * @package Pandra
  */
-$GLOBALS['THRIFT_ROOT'] = dirname(__FILE__).'/../thrift-php/';
+$GLOBALS['THRIFT_ROOT'] = dirname(__FILE__).'/thrift-php/';
 
 require_once $GLOBALS['THRIFT_ROOT'].'/packages/cassandra/Cassandra.php';
 require_once $GLOBALS['THRIFT_ROOT'].'/transport/TSocket.php';

diff --git a/tests/lib/PandraTest.php b/tests/lib/PandraTest.php
@@ -115,8 +115,8 @@ public function testGetKeyspace() {
         // at least be able to pull out their basic attributes
         $expectedKeys = array('FlushPeriodInMinutes', 'Type', 'Desc');
 
-        foreach ($ks as $keySpace => $columnFamily) {
-            $diff = array_diff($expectedKeys, array_keys($columnFamily));
+        foreach ($ks as $columnFamily => $attributes) {
+            $diff = array_diff($expectedKeys, array_keys($attributes    ));
             $this->assertTrue(empty($diff));
         }
     }