sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly remove temp test directory tree 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
pull/7631/head
John Molakvoæ (skjnldsv) 2017-12-28 13:41:38 +07:00
parent 02bfc867ef
commit b71c9205ef
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/lib/Template/SCSSCacherTest.php
Unescape Escape View File

@ -399,6 +399,18 @@ class SCSSCacherTest extends \Test\TestCase {
return sha1(uniqid(mt_rand(), true));
}
private function rrmdir($directory) {
$files = array_diff(scandir($directory), array('.','..'));
foreach ($files as $file) {
if (is_dir($directory . '/' . $file)) {
$this->rrmdir($directory . '/' . $file);
} else {
unlink($directory . '/' . $file);
}
}
return rmdir($directory);
}
/**
* @param $path
* @param $appName
@ -418,7 +430,7 @@ class SCSSCacherTest extends \Test\TestCase {
$actual = self::invokePrivate($this->scssCacher, 'getWebDir', [$tmpDir.$path, $appName, $tmpDir.$serverRoot, $webRoot]);
$this->assertEquals($correctWebDir, $actual);
array_pop(\OC::$APPSROOTS);
rmdir($tmpDir.$path);
$this->rrmdir($tmpDir.$path);
}
}