Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Test space handling added to prevent existing storage data in tests.

Browse source
This commit is contained in:
tomas 2005-07-28 11:48:11 +00:00
parent 91dfea7787
commit f75834dc22
1 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

60
livesupport/modules/storageServer/var/BasicStor.php
View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.56 $ Version : $Revision: 1.57 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/BasicStor.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/BasicStor.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -53,7 +53,7 @@ require_once "Transport.php";
* Core of LiveSupport file storage module * Core of LiveSupport file storage module
* *
* @author $Author: tomas $ * @author $Author: tomas $
* @version $Revision: 1.56 $ * @version $Revision: 1.57 $
* @see Alib * @see Alib
*/ */
class BasicStor extends Alib{ class BasicStor extends Alib{
@ -1363,6 +1363,39 @@ class BasicStor extends Alib{
parent::deleteData(); parent::deleteData();
$this->initData(); $this->initData();
} }
/**
* Create BasicStor object with temporarily changed configuration
* to prevent data changes in tests
*
*/
function createTestSpace(&$dbc, $config){
$configBckp = $config;
$config['tblNamePrefix'] .= '_test_';
mkdir($config['storageDir'].'/tmp');
$config['storageDir'] .= '/tmp/stor';
$config['bufferDir'] = $config['storageDir'].'/buffer';
$config['transDir'] .= '/tmp/trans';
$config['accessDir'] .= '/tmp/access';
mkdir($config['storageDir']);
mkdir($config['bufferDir']);
$bs =& new BasicStor($dbc, $config);
$bs->configBckp = $configBckp;
$r = $bs->install();
if(PEAR::isError($r)){ return $r; }
return $bs;
}
/**
* Clean up test space
*
*/
function releaseTestSpace(){
$r = $this->uninstall();
if(PEAR::isError($r)){ return $r; }
#rmdir($this->config['bufferDir']);
rmdir($this->config['storageDir']);
$this->config = $this->configBckp;
rmdir($this->config['storageDir'].'/tmp');
}
/** /**
* testData * testData
* *
@ -1441,7 +1474,9 @@ class BasicStor extends Alib{
test4{$trash} test4{$trash}
"; ";
} }
$this->test_dump = $this->dumpTree($this->storId, ' ', ' ', '{name}'); $r = $this->dumpTree($this->storId, ' ', ' ', '{name}');
if($this->dbc->isError($r)) return $r;
$this->test_dump = $r;
if($this->test_dump==$this->test_correct) if($this->test_dump==$this->test_correct)
{ $this->test_log.="# BasicStor::test: OK\n"; return true; } { $this->test_log.="# BasicStor::test: OK\n"; return true; }
else return PEAR::raiseError( else return PEAR::raiseError(
@ -1600,16 +1635,17 @@ class BasicStor extends Alib{
$this->dbc->query("DROP TABLE {$this->accessTable}"); $this->dbc->query("DROP TABLE {$this->accessTable}");
$d = @dir($this->storageDir); $d = @dir($this->storageDir);
while (is_object($d) && (false !== ($entry = $d->read()))){ while (is_object($d) && (false !== ($entry = $d->read()))){
if(filetype("{$this->storageDir}/$entry")=='dir' && if(filetype("{$this->storageDir}/$entry")=='dir'){
$entry!='CVS' && strlen($entry)==3) if($entry!='CVS' && $entry!='tmp' && strlen($entry)==3)
{ {
$dd = dir("{$this->storageDir}/$entry"); $dd = dir("{$this->storageDir}/$entry");
while (false !== ($ee = $dd->read())){ while (false !== ($ee = $dd->read())){
if(substr($ee, 0, 1)!=='.') if(substr($ee, 0, 1)!=='.')
unlink("{$this->storageDir}/$entry/$ee"); unlink("{$this->storageDir}/$entry/$ee");
}
$dd->close();
rmdir("{$this->storageDir}/$entry");
} }
$dd->close();
rmdir("{$this->storageDir}/$entry");
} }
} }
if(is_object($d)) $d->close(); if(is_object($d)) $d->close();