Added check and cleanup for storage/filecache
Some tests don't clean up the file cache and sometimes entries are reused by mistake in subsequent test suites. This cleans up the file cache and storage after every test suite and also shows an annoying warning.
This commit is contained in:
parent
5def2a72dd
commit
19c73a8464
|
@ -41,6 +41,12 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
|
public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
|
||||||
|
if ($this->cleanStorages() && $this->isShowSuiteWarning()) {
|
||||||
|
printf("TestSuite '%s': Did not clean up storages\n", $suite->getName());
|
||||||
|
}
|
||||||
|
if ($this->cleanFileCache() && $this->isShowSuiteWarning()) {
|
||||||
|
printf("TestSuite '%s': Did not clean up file cache\n", $suite->getName());
|
||||||
|
}
|
||||||
if ($this->cleanStrayDataFiles() && $this->isShowSuiteWarning()) {
|
if ($this->cleanStrayDataFiles() && $this->isShowSuiteWarning()) {
|
||||||
printf("TestSuite '%s': Did not clean up data dir\n", $suite->getName());
|
printf("TestSuite '%s': Did not clean up data dir\n", $suite->getName());
|
||||||
}
|
}
|
||||||
|
@ -114,6 +120,26 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function cleanStorages() {
|
||||||
|
$sql = 'DELETE FROM `*PREFIX*storages`';
|
||||||
|
$query = \OC_DB::prepare( $sql );
|
||||||
|
$result = $query->execute();
|
||||||
|
if ($result > 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function cleanFileCache() {
|
||||||
|
$sql = 'DELETE FROM `*PREFIX*filecache`';
|
||||||
|
$query = \OC_DB::prepare( $sql );
|
||||||
|
$result = $query->execute();
|
||||||
|
if ($result > 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private function cleanStrayHooks() {
|
private function cleanStrayHooks() {
|
||||||
$hasHooks = false;
|
$hasHooks = false;
|
||||||
$hooks = OC_Hook::getHooks();
|
$hooks = OC_Hook::getHooks();
|
||||||
|
|
Loading…
Reference in New Issue