Browse Source

Correctly remove temp test directory tree

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
tags/v13.0.0beta4
John Molakvoæ (skjnldsv) 6 years ago
parent
commit
b71c9205ef
No account linked to committer's email address
1 changed files with 13 additions and 1 deletions
  1. 13
    1
      tests/lib/Template/SCSSCacherTest.php

+ 13
- 1
tests/lib/Template/SCSSCacherTest.php 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);
}

}

Loading…
Cancel
Save