Changeset 1115

Timestamp:

09/08/08 05:23:26 (3 months ago)

Author:

arnoschn

Message:

Adding checking for memcached socket and feature to skip a unit test

Files:

• branches/arnoschn/cache/lib/AkUnitTest.php (modified) (1 diff)
• branches/arnoschn/cache/lib/utils/scripts/ci-test.php (modified) (3 diffs)
• branches/arnoschn/cache/script/extras/TPL-caching.yml (added)
• branches/arnoschn/cache/script/extras/TPL-ci-config.yaml (modified) (1 diff)
• branches/arnoschn/cache/test/unit/lib/AkCache.php (modified) (2 diffs)
• branches/arnoschn/cache/test/unit/lib/AkCache/AkMemcache.php (modified) (2 diffs)
• branches/arnoschn/cache/test/unit/suites/config (added)
• branches/arnoschn/cache/test/unit/suites/config/memcached (added)

branches/arnoschn/cache/lib/AkUnitTest.php

@@ -38 +38 @@
-    }
-    
+    /**
+     *    Gets a list of test names. Normally that will
+     *    be all internal methods that start with the
+     *    name "test". This method should be overridden
+     *    if you want a different rule.
+     *    @return array        List of test names.
+     *    @access public
+     */
+    function getTests() {
+        $methods = array();
+        if (isset($this->skip) && $this->skip == true) {
+            return $methods;
+        }
+        foreach (get_class_methods(get_class($this)) as $method) {
+            if ($this->_isTest($method)) {
+                $methods[] = $method;
+            }
+        }
+        return $methods;
+    }
+    
-    function _configure()
-    {
+        $this->skip = !$this->_checkIfEnabled();
-        $this->_loadFixtures();
+        
+    }
+    
+    function _checkIfEnabled($file = null)
+    {
+        if ($file == null) {
+            $file = isset($this->check_file)?$this->check_file:null;
+        }
+        if ($file!=null && file_exists($file)) {
+            $val = file_get_contents($file);
+            if ($val == 0) {
+                return false;
+            }
+        }
+        return true;
-    }
-    

branches/arnoschn/cache/lib/utils/scripts/ci-test.php

@@ -151 +151 @@
-            }
-            
+            if (!$this->_checkMemcacheInstallation()) {
+                return false;
+            }
-            
-        } else {
@@ -159 +162 @@
-            }
-            $this->loadSettings();
-
+
+
+
-        $this->_fixTestInstallationPermissions();
-        $this->configured['ci-config.yaml'] = true;
@@ -428 +433 @@
-            exec('chmod -Rf 777 '.AK_CI_TEST_DIR.$dir);
-        }
+    }
+    
+    function _setupMemcache()
+    {
+        $memcachedInstalled = $this->promptUserVar('Certain tests need a memcached running. Do you have a memcached installation?',array('default'=>'No'));
+        
+        if (!in_array(strtolower($memcachedInstalled),array('y','yes','si','ja','1'))) {
+            $installation = $this->settings['test-installation'];
+            $memcacheTestConfigFile = $installation.DS.'test'.DS.'unit'.DS.'suites'.DS.'config'.DS.'memcached';
+            file_put_contents($memcacheTestConfigFile,'0');
+            return;
+        } else {
+            $socket = $this->_configureMemcache();
+            if ($socket !== false) {
+                $res = $this->_createMemcachedConfig($socket);
+                if (!$res) {
+                    $this->error('Could not create caching.yml. Disabling memcached support.');
+                    $installation = $this->settings['test-installation'];
+                    $memcacheTestConfigFile = $installation.DS.'test'.DS.'unit'.DS.'suites'.DS.'config'.DS.'memcached';
+                    file_put_contents($memcacheTestConfigFile,'0');
+                    return;
+                } else {
+                    
+                }
+            }
+        }
+    }
+    
+    function _createMemcachedConfig($socket)
+    {
+        $file1 = AK_CI_TEST_DIR.DS.'test'.DS.'fixtures'.DS.'app'.DS.'config'.DS.'caching.yml';
+        $file2 = AK_CI_TEST_DIR.DS.'config'.DS.'caching.yml';
+        $templateFile = AK_BASE_DIR.DS.'script'.DS.'extras'.DS.'TPL-caching.yml';
+        $this->info('Creating caching configuration for');
+        $res1 = file_put_contents($file1,str_replace('${memcached_server}',$socket,file_get_contents($templateFile)))>0;
+        $res2 = file_put_contents($file1,str_replace('${memcached_server}',$socket,file_get_contents($templateFile)))>0;
+        $res3 = file_put_contents(AK_CI_CONFIG_FILE,str_replace('${memcached-socket}',$socket,file_get_contents(AK_CI_CONFIG_FILE)));
+        return $res1 && $res2 && $res3;
+    }
+    
+    function _checkMemcacheInstallation($socket = null)
+    {
+        if ($socket == null) {
+            $socket = $this->settings['memcached-socket'];
+        }
+        require_once(AK_BASE_DIR.DS.'lib'.DS.'AkCache'.DS.'AkMemcache.php');
+        $memcache = new AkMemcache();
+        return @$memcached->init(array('servers'=>array($socket)));
+    }
+    function _configureMemcache()
+    {
+        require_once(AK_BASE_DIR.DS.'lib'.DS.'AkCache'.DS.'AkMemcache.php');
+        $memcache = new AkMemcache();
+        while (($socket = $this->promptUserVar('Please provide the socket memcached is running on',array('default'=>'localhost:11211')) && !$this->_checkMemcacheInstallation($socket))) {
+            $this->error('Could not connect to memcached at socket: '.$socket);
+            $tryAgain = $this->promptUserVar('Want to try again configuring memcached support?',array('default'=>'Yes'));
+            if (!in_array(strtolower($memcachedInstalled),array('y','yes','si','ja','1'))) {
+                return false;
+            }
+        }
+        return $socket;
-    }
-    function loadSettings($filename=AK_CI_CONFIG_FILE)

branches/arnoschn/cache/script/extras/TPL-ci-config.yaml

@@ -2 +2 @@
-test-installation: ${test-installation}
-test-url: ${test-url}
+memcached-socket: ${memcached-socket}
-
-executables: 

branches/arnoschn/cache/test/unit/lib/AkCache.php

@@ -6 +6 @@
-
-require_once(AK_LIB_DIR.DS.'AkCache.php');
+
+defined('AK_TEST_MEMCACHED_CHECKFILE')? null: define('AK_TEST_MEMCACHED_CHECKFILE',AK_TEST_DIR.DS.'lib'.DS.'unit'.DS.'suites'.DS.'config'.DS.'memcached');
+
-
-class AkCache_TestCase extends  AkUnitTest 
@@ -23 +26 @@
-    function test_all_caches()
-    {
-
-
+
+
+
+
+
-        $unitTests = array('_testInit','_test_get_and_save','_testremove', '_Testclean');
-        

branches/arnoschn/cache/test/unit/lib/AkCache/AkMemcache.php

@@ -3 +3 @@
-require_once(AK_LIB_DIR.DS.'AkCache.php');
-require_once(AK_LIB_DIR.DS.'AkCache'.DS.'AkMemcache.php');
+
+defined('AK_TEST_MEMCACHED_CHECKFILE')? null: define('AK_TEST_MEMCACHED_CHECKFILE',AK_TEST_DIR.DS.'lib'.DS.'unit'.DS.'suites'.DS.'config'.DS.'memcached');
-
-class Test_AkMemcache extends  UnitTestCase
@@ -10 +12 @@
-     */
-    var $memcache;
+    
+    var $check_file = AK_TEST_MEMCACHED_CHECKFILE;
+    
-    function setUp()
-    {