From b3e8696fdbddd240618b3c7693945fdaa47d258a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 5 Jul 2012 13:37:33 +0200
Subject: [PATCH] Enforce flush on CI test runs

Would be better handled by an explicity "clear manifest" task,
but that's the best we can do for now. Necessary because
of removed 'flush' setting from bootstrap.php, see
https://github.com/silverstripe/sapphire/pull/620
---
 phpunit.teamcity.mssql.xml      | 14 ++++++++------
 phpunit.teamcity.postgresql.xml | 14 ++++++++------
 phpunit.teamcity.sqlite3.xml    | 14 ++++++++------
 phpunit.teamcity.xml            |  1 +
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/phpunit.teamcity.mssql.xml b/phpunit.teamcity.mssql.xml
index 8967b2a..49ac7ee 100644
--- a/phpunit.teamcity.mssql.xml
+++ b/phpunit.teamcity.mssql.xml
@@ -18,14 +18,16 @@
 		</exclude>
 	</groups>
 
-	<!-- 
-		Set different database connection.
-		Relies on the presence of the 'zframeworktest_dbswitcher' module
-		(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
-		as well as on constants in _ss_environment.php (see module README).
-	-->
 	<php>
+		<!-- 
+			Set different database connection.
+			Relies on the presence of the 'zframeworktest_dbswitcher' module
+			(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
+			as well as on constants in _ss_environment.php (see module README).
+		-->
 	  <get name="db" value="mssql"/>
+	  <!-- Always flush the manifest -->
+	  <get name="flush" value="1"/>
 	</php>
 
 </phpunit>
\ No newline at end of file
diff --git a/phpunit.teamcity.postgresql.xml b/phpunit.teamcity.postgresql.xml
index 50b319b..81e226f 100644
--- a/phpunit.teamcity.postgresql.xml
+++ b/phpunit.teamcity.postgresql.xml
@@ -18,14 +18,16 @@
 		</exclude>
 	</groups>
 
-	<!-- 
-		Set different database connection.
-		Relies on the presence of the 'zframeworktest_dbswitcher' module
-		(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
-		as well as on constants in _ss_environment.php (see module README).
-	-->
 	<php>
+		<!-- 
+			Set different database connection.
+			Relies on the presence of the 'zframeworktest_dbswitcher' module
+			(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
+			as well as on constants in _ss_environment.php (see module README).
+		-->
 	  <get name="db" value="postgresql"/>
+	  <!-- Always flush the manifest -->
+	  <get name="flush" value="1"/>
 	</php>
 
 </phpunit>
\ No newline at end of file
diff --git a/phpunit.teamcity.sqlite3.xml b/phpunit.teamcity.sqlite3.xml
index ab27dbc..ace5768 100644
--- a/phpunit.teamcity.sqlite3.xml
+++ b/phpunit.teamcity.sqlite3.xml
@@ -18,14 +18,16 @@
 		</exclude>
 	</groups>
 
-	<!-- 
-		Set different database connection.
-		Relies on the presence of the 'zframeworktest_dbswitcher' module
-		(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
-		as well as on constants in _ss_environment.php (see module README).
-	-->
 	<php>
+		<!-- 
+			Set different database connection.
+			Relies on the presence of the 'zframeworktest_dbswitcher' module
+			(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
+			as well as on constants in _ss_environment.php (see module README).
+		-->
 	  <get name="db" value="sqlite3"/>
+	  <!-- Always flush the manifest -->
+	  <get name="flush" value="1"/>
 	</php>
 
 </phpunit>
\ No newline at end of file
diff --git a/phpunit.teamcity.xml b/phpunit.teamcity.xml
index cac35be..e2ac1a6 100644
--- a/phpunit.teamcity.xml
+++ b/phpunit.teamcity.xml
@@ -34,4 +34,5 @@
 			<group>sanitychecks</group>
 		</exclude>
 	</groups>
+	
 </phpunit>
\ No newline at end of file