From 74a170f2a5e934bca7878fc229ad04cb9cf6e543 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 10 Jun 2013 19:28:55 +0200 Subject: [PATCH] [Fixing unit tests in Windows] on windows open resources will be locked while the stream is open. closing the resource allows deletion below --- lib/files/view.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/files/view.php b/lib/files/view.php index e2fc8d965b..25071709fb 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -386,6 +386,12 @@ class View { $source = $this->fopen($path1 . $postFix1, 'r'); $target = $this->fopen($path2 . $postFix2, 'w'); list($count, $result) = \OC_Helper::streamCopy($source, $target); + + // close open handle - especially $source is necessary because unlink below will + // throw an exception on windows because the file is locked + fclose($source); + fclose($target); + if ($result !== false) { list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1); $storage1->unlink($internalPath1);