From d95af01fbb5a8d80fa4560cceef3a00fa7af32a6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 9 Jan 2013 23:54:35 +0100
Subject: [PATCH] Delete fixtures BEFORE test teardown, avoid problems with
 shutdown registrations

We've had some custom code register shutdown methods for reindexing.
This code is triggered on delete() amongst other actions.
It's conditional on SapphireTest::is_running_tests() which is
unset in SapphireTest->tearDown(), so we have to place any
delete operations before that.
---
 tests/DMSVersioningTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/DMSVersioningTest.php b/tests/DMSVersioningTest.php
index 2971320..f3f02af 100755
--- a/tests/DMSVersioningTest.php
+++ b/tests/DMSVersioningTest.php
@@ -25,8 +25,6 @@ class DMSVersioningTest extends SapphireTest {
 	}
 
 	function tearDown() {
-		parent::tearDown();
-
 		$d = DataObject::get("DMSDocument");
 		foreach($d as $d1) {
 			$d1->delete();
@@ -39,6 +37,8 @@ class DMSVersioningTest extends SapphireTest {
 		//delete the test folder after the test runs
 		$this->delete(BASE_PATH . DIRECTORY_SEPARATOR . 'dms-assets-test-versions');
 
+		parent::tearDown();
+
 		//set the old DMS folder back again
 		DMS::$dmsFolder = self::$dmsFolderOld;
 		DMS::$dmsFolderSize = self::$dmsFolderSizeOld;