Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 6 insertions, 0 deletions

diff --git a/modules/watermark/tests/Admin_Watermarks_Controller_Test.php b/modules/watermark/tests/Admin_Watermarks_Controller_Test.php
index 0b4ba84b..6c6ecb15 100644
--- a/modules/watermark/tests/Admin_Watermarks_Controller_Test.php
+++ b/modules/watermark/tests/Admin_Watermarks_Controller_Test.php
@@ -68,6 +68,9 @@ class Admin_Watermarks_Controller_Test extends Gallery_Unit_Test_Case {
     $controller->add();
     $results = ob_get_clean();
 
+    // Delete all files marked using system::delete_later (from gallery_event::gallery_shutdown)
+    system::delete_marked_files();
+
     // Add should *not* be successful, and watermark should be deleted
     $this->assert_equal("", $results);
     $this->assert_false(file_exists($watermark_path));
@@ -115,6 +118,9 @@ class Admin_Watermarks_Controller_Test extends Gallery_Unit_Test_Case {
     $controller->add();
     $results = ob_get_clean();
 
+    // Delete all files marked using system::delete_later (from gallery_event::gallery_shutdown)
+    system::delete_marked_files();
+
     // Add should *not* be successful, and watermark should be deleted
     $this->assert_equal("", $results);
     $this->assert_false(file_exists($watermark_path));