Fix up some tests:

- unlink copied files because they confused File_Structure_Test
- update golden files

4 files changed, 11 insertions, 9 deletions

diff --git a/modules/gallery/tests/Movie_Helper_Test.php b/modules/gallery/tests/Movie_Helper_Test.php
index 03fa2da9..9107827a 100644
--- a/modules/gallery/tests/Movie_Helper_Test.php
+++ b/modules/gallery/tests/Movie_Helper_Test.php
@@ -71,6 +71,7 @@ class Movie_Helper_Test extends Gallery_Unit_Test_Case {
     } catch (Exception $e) {
       // pass
     }
+    unlink(TMPPATH . "test_flv_with_no_extension");
   }
 
   public function get_file_metadata_with_illegal_extension_test() {
@@ -91,6 +92,7 @@ class Movie_Helper_Test extends Gallery_Unit_Test_Case {
     } catch (Exception $e) {
       // pass
     }
+    unlink(TMPPATH . "test_flv_with_php_extension.php");
   }
 
   public function get_file_metadata_with_valid_extension_but_illegal_file_contents_test() {
@@ -101,5 +103,6 @@ class Movie_Helper_Test extends Gallery_Unit_Test_Case {
     // therefore will never be executed.
     $this->assert_equal(array(0, 0, "video/x-flv", "flv", 0),
                         movie::get_file_metadata(TMPPATH . "test_php_with_flv_extension.flv"));
+    unlink(TMPPATH . "test_php_with_flv_extension.flv");
   }
 }
diff --git a/modules/gallery/tests/Photo_Helper_Test.php b/modules/gallery/tests/Photo_Helper_Test.php
index 79b5ccfd..7ba8324f 100644
--- a/modules/gallery/tests/Photo_Helper_Test.php
+++ b/modules/gallery/tests/Photo_Helper_Test.php
@@ -37,6 +37,7 @@ class Photo_Helper_Test extends Gallery_Unit_Test_Case {
     copy(MODPATH . "gallery/tests/test.jpg", TMPPATH . "test_jpg_with_no_extension");
     $this->assert_equal(array(1024, 768, "image/jpeg", "jpg"),
                         photo::get_file_metadata(TMPPATH . "test_jpg_with_no_extension"));
+    unlink(TMPPATH . "test_jpg_with_no_extension");
   }
 
   public function get_file_metadata_with_illegal_extension_test() {
@@ -56,6 +57,7 @@ class Photo_Helper_Test extends Gallery_Unit_Test_Case {
     copy(MODPATH . "gallery/tests/test.jpg", TMPPATH . "test_jpg_with_php_extension.php");
     $this->assert_equal(array(1024, 768, "image/jpeg", "jpg"),
                         photo::get_file_metadata(TMPPATH . "test_jpg_with_php_extension.php"));
+    unlink(TMPPATH . "test_jpg_with_php_extension.php");
   }
 
   public function get_file_metadata_with_valid_extension_but_illegal_file_contents_test() {
@@ -66,5 +68,6 @@ class Photo_Helper_Test extends Gallery_Unit_Test_Case {
     } catch (Exception $e) {
       // pass
     }
+    unlink(TMPPATH . "test_php_with_jpg_extension.jpg");
   }
 }
diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 9473f9f6..4cd9f047 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -1,6 +1,5 @@
 modules/comment/controllers/admin_manage_comments.php        queue                DIRTY_CSRF
 modules/comment/helpers/comment_rss.php                      feed                 DIRTY_AUTH
-modules/digibug/controllers/digibug.php                      print_proxy          DIRTY_CSRF|DIRTY_AUTH
 modules/g2_import/controllers/admin_g2_import.php            autocomplete         DIRTY_CSRF
 modules/g2_import/controllers/g2.php                         map                  DIRTY_CSRF
 modules/gallery/controllers/admin.php                        __call               DIRTY_AUTH
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 67a8b948..457c157f 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -39,8 +39,6 @@ modules/comment/views/comments.html.php                      31  DIRTY_ATTR $com
 modules/comment/views/user_profile_comments.html.php         5   DIRTY_ATTR $comment->id
 modules/comment/views/user_profile_comments.html.php         10  DIRTY_JS $comment->item()->url()
 modules/comment/views/user_profile_comments.html.php         11  DIRTY    $comment->item()->thumb_img(array(),50)
-modules/digibug/views/digibug_form.html.php                  4   DIRTY    form::open("http://www.digibug.com/dapi/order.php")
-modules/digibug/views/digibug_form.html.php                  6   DIRTY    form::hidden($key,$value)
 modules/exif/views/exif_dialog.html.php                      14  DIRTY    $details[$i]["caption"]
 modules/exif/views/exif_dialog.html.php                      21  DIRTY    $details[$i]["caption"]
 modules/g2_import/views/admin_g2_import.html.php             7   DIRTY_JS url::site("__ARGS__")
@@ -343,13 +341,12 @@ modules/rss/views/feed.mrss.php                              67  DIRTY_ATTR $ite
 modules/rss/views/feed.mrss.php                              68  DIRTY_ATTR $item->height
 modules/rss/views/feed.mrss.php                              69  DIRTY_ATTR $item->width
 modules/rss/views/rss_block.html.php                         6   DIRTY_JS rss::url($url)
-modules/search/views/search.html.php                         39  DIRTY_ATTR $item_class
-modules/search/views/search.html.php                         40  DIRTY_JS $item->url()
-modules/search/views/search.html.php                         41  DIRTY    $item->thumb_img(array("class"=>"g-thumbnail"))
 modules/search/views/search.html.php                         43  DIRTY_ATTR $item_class
-modules/search/views/search.html.php                         53  DIRTY    $theme->paginator()
-modules/search/views/search_link.html.php                    14  DIRTY_ATTR $item->id
-modules/search/views/search_link.html.php                    16  DIRTY_ATTR $item->parent_id
+modules/search/views/search.html.php                         44  DIRTY_JS $item->url()
+modules/search/views/search.html.php                         45  DIRTY    $item->thumb_img(array("class"=>"g-thumbnail"))
+modules/search/views/search.html.php                         47  DIRTY_ATTR $item_class
+modules/search/views/search.html.php                         57  DIRTY    $theme->paginator()
+modules/search/views/search_link.html.php                    15  DIRTY_ATTR $album_id
 modules/server_add/views/admin_server_add.html.php           8   DIRTY_JS url::site("__ARGS__")
 modules/server_add/views/admin_server_add.html.php           19  DIRTY    $form
 modules/server_add/views/admin_server_add.html.php           30  DIRTY_ATTR $id