summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-01-13 15:47:39 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2014-01-13 15:47:39 -0800
commit3c0e4a3bc6fadc950fca73a104aa1860814061ab (patch)
tree4001ed143536a264a2c652a78769755038b0c442
parentcb071a9f3541d0a4fb3d313b0060af9160f1f493 (diff)
parent70650a004a417ece24188a82a20a84546283df46 (diff)
downloadnextcloud-server-3c0e4a3bc6fadc950fca73a104aa1860814061ab.tar.gz
nextcloud-server-3c0e4a3bc6fadc950fca73a104aa1860814061ab.zip
Merge pull request #6752 from owncloud/silence-test-listener
no warnings within unlinkDir() within the TestCleanupListener
-rw-r--r--tests/testcleanuplistener.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/testcleanuplistener.php b/tests/testcleanuplistener.php
index 368ea7bc8f4..a969ece6dd5 100644
--- a/tests/testcleanuplistener.php
+++ b/tests/testcleanuplistener.php
@@ -58,7 +58,7 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
}
private function unlinkDir($dir) {
- if ($dh = opendir($dir)) {
+ if ($dh = @opendir($dir)) {
while (($file = readdir($dh)) !== false) {
if ($file === '..' || $file === '.') {
continue;
@@ -68,12 +68,12 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
$this->unlinkDir($path);
}
else {
- unlink($path);
+ @unlink($path);
}
}
closedir($dh);
}
- rmdir($dir);
+ @rmdir($dir);
}
private function cleanStrayDataFiles() {