Merge remote-tracking branch 'remotes/zf2/master' into test/feed-entr…

…y-type-detection
zendframework · Jul 5, 2012 · 62ca6c9 · 62ca6c9
commit 62ca6c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/test/Writer/AbstractWriterTestCase.php b/test/Writer/AbstractWriterTestCase.php
@@ -66,7 +66,12 @@ protected function getTestAssetFileName()
 
     public function tearDown()
     {
-        @unlink($this->getTestAssetFileName());
+        if (file_exists($this->getTestAssetFileName())) {
+            if (!is_writable($this->getTestAssetFileName())) {
+                chmod($this->getTestAssetFileName(), 0777);
+            }
+            @unlink($this->getTestAssetFileName());
+        }
     }
 
     public function testNoFilenameSet()