From 8222d72d39dcef639a2193a0f64bac18fa9b5367 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 19 Oct 2010 05:06:39 +0000 Subject: [PATCH] MINOR #6083 FileTest doesn't remove test folders and files created during test (from r111903) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112943 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/filesystem/FileTest.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/filesystem/FileTest.php b/tests/filesystem/FileTest.php index 5fe7de8fa..457168c58 100644 --- a/tests/filesystem/FileTest.php +++ b/tests/filesystem/FileTest.php @@ -248,6 +248,8 @@ class FileTest extends SapphireTest { } function tearDown() { + parent::tearDown(); + /* Remove the test files that we've created */ $fileIDs = $this->allFixtureIDs('File'); foreach($fileIDs as $fileID) { @@ -261,9 +263,11 @@ class FileTest extends SapphireTest { $folder = DataObject::get_by_id('Folder', $folderID); if($folder && file_exists(BASE_PATH."/$folder->Filename")) Filesystem::removeFolder(BASE_PATH."/$folder->Filename"); } - - parent::tearDown(); + + // Remove left over folders and any files that may exist + if(file_exists('../assets/FileTest')) Filesystem::removeFolder('../assets/FileTest'); + if(file_exists('../assets/FileTest-subfolder')) Filesystem::removeFolder('../assets/FileTest-subfolder'); + if(file_exists('../assets/FileTest.txt')) unlink('../assets/FileTest.txt'); } - - + } \ No newline at end of file