[CS-Project-svn_notify] SF.net SVN: cs-project:[963] trunk/1.2/includes/setup
Brought to you by:
crazedsanity
From: <cra...@us...> - 2009-02-10 17:44:02
|
Revision: 963 http://cs-project.svn.sourceforge.net/cs-project/?rev=963&view=rev Author: crazedsanity Date: 2009-02-10 17:43:56 +0000 (Tue, 10 Feb 2009) Log Message: ----------- Fix check for writability of lib to rw, implement tests for external libs. /includes/setup/1.inc: * remove unnecessary (completed) TODO * check "rw" directory instead of lib (now we write config to the rw dir) * NOTE::: if the rw directory isn't writable, config{} throws an exception that can't be caught here. Until such time as the error can be caught or some other workaround is added, the error will not be a nice one. /includes/setup/5.inc: * add unit tests for cs-arrayToPath, cs-content, and cs-phpxml. Modified Paths: -------------- trunk/1.2/includes/setup/1.inc trunk/1.2/includes/setup/5.inc Modified: trunk/1.2/includes/setup/1.inc =================================================================== --- trunk/1.2/includes/setup/1.inc 2009-02-10 17:14:40 UTC (rev 962) +++ trunk/1.2/includes/setup/1.inc 2009-02-10 17:43:56 UTC (rev 963) @@ -6,8 +6,6 @@ $requiredFields = array('dbname', 'host', 'port', 'user', 'password'); -//TODO: consider adding a check that the /lib directory is writable, to avoid errors later on. - if($_POST) { reset_all_steps(FALSE); store_setup_data(1, $_POST['fields']); @@ -42,11 +40,11 @@ } else { //check if the /lib dir is writeable, so they've been warned. - $fsObj = new cs_fileSystem(dirname(__FILE__) .'/../../lib'); + $fsObj = new cs_fileSystem(dirname(__FILE__) .'/../../rw'); if(!$fsObj->is_writable(NULL)) { $page->set_message_wrapper(array( 'title' => "Warning", - 'message' => "The lib directory of your install isn't writable. Please correct this <BR>\n" . + 'message' => "The 'rw' directory of your install isn't writable. Please correct this <BR>\n" . "before continuing, as setup will not be able create the config.xml file.", 'type' => 'notice' )); Modified: trunk/1.2/includes/setup/5.inc =================================================================== --- trunk/1.2/includes/setup/5.inc 2009-02-10 17:14:40 UTC (rev 962) +++ trunk/1.2/includes/setup/5.inc 2009-02-10 17:43:56 UTC (rev 963) @@ -28,6 +28,9 @@ $test = &new TestSuite("All Tests"); $test->addTestFile(dirname(__FILE__) .'/../../lib/_unitTests_/cs-content_tests.php'); + $test->addTestFile(dirname(__FILE__) .'/../../lib/cs-arrayToPath/tests/testOfA2P.php'); + $test->addTestFile(dirname(__FILE__) .'/../../lib/cs-content/tests/testOfCSContent.php'); + $test->addTestFile(dirname(__FILE__) .'/../../lib/cs-phpxml/tests/testOfCSPHPXML.php'); $display = new HtmlReporter(); $test->run($display); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |