Merge pull request #117 from VinceMacBuche/bug_3255/correct_migration…

…_test_proces Fixes #3255 : Fix migration test process
Normation · Feb 11, 2013 · bd37b50 · bd37b50
2 parents 09a1088 + 275b602
commit bd37b50
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/rudder-core/src/test/scala/com/normation/rudder/migration/DBCommon.scala b/rudder-core/src/test/scala/com/normation/rudder/migration/DBCommon.scala
@@ -67,7 +67,7 @@ import java.sql.Timestamp
  * state for the full example (after/before class).
  */
 trait DBCommon extends Specification with Loggable with Tags {
-  skipAllIf(System.getProperty("test.postgres", "false").toBoolean != true)  
+  skipAllIf(System.getProperty("test.postgres", "true").toBoolean != true)
 
   def sqlClean : String
   def sqlInit : String

diff --git a/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration_10_2.scala b/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration_10_2.scala
@@ -127,18 +127,17 @@ CREATE TEMP TABLE EventLog (
     }).toSeq
   }
 
-
+  sequential
   //actual tests
   "Event Logs" should {
 
     "be all found" in {          
       val logs = migration.findAllEventLogs.openOrThrowException("For tests")
-      
+
       logs.size must beEqualTo(logs10WithId.size) and
       forallWhen(logs) {
         case MigrationEventLog(id, eventType, data) => 
           val l = logs10WithId.values.find(x => x.id.get == id).get
-
           l.data must be_==/(data) and
           l.eventType === eventType
       }
@@ -241,7 +240,7 @@ CREATE TEMP TABLE EventLog (
     }).toSeq
   }
 
-
+  sequential
   //actual tests
   "Event Logs" should {
 
@@ -364,7 +363,7 @@ CREATE TEMP TABLE EventLog (
     }).toSeq
   }
 
-
+  sequential
   //actual tests
   "Event Logs" should {
 
@@ -510,7 +509,7 @@ CREATE TEMP TABLE MigrationEventLog(
       log.copy( id = Some(logs10WithId(k).id.get ) ) //actually get so that an exception is throw if there is no ID set
     }).toSeq
   }
-
+  sequential
   //actual tests
   "Event Logs" should {
 

diff --git a/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration_10_2.scala b/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration_10_2.scala
@@ -142,6 +142,7 @@ CREATE TEMP TABLE MigrationEventLog(
     res
   }
 
+  sequential
   //actual tests
   "Migration of event logs from fileformat 1.0 to 2" should {
 
@@ -282,6 +283,7 @@ CREATE TEMP TABLE MigrationEventLog(
     res
   }
 
+  sequential
   //actual tests
   "Migration of event logs from fileformat 2 to 3" should {