--- summary 
+++ summary 
@@ -1,19 +1,19 @@
 Test Suite: ERP5-MASTER
-Revision: slapos=3628-6841ce714ba60d8f5a3be882e5585ab513f0af85,erp5=41725-e048fd74dcece5687086ff4e3536d86430f9fd5f
+Revision: slapos=3628-6841ce714ba60d8f5a3be882e5585ab513f0af85,erp5=41726-9f1138854c6d72965119cd6cb6f9a603608123b6
 Result: FAIL
 
 All tests: 3497
-Failures: 1
-Errors: 0
+Failures: 0
+Errors: 1
 Skips: 196
 
- http://erp5.nexedi.com/test_result_module/20121130-20123E2D/view
+ http://erp5.nexedi.com/test_result_module/20121205-CB7A71C/view
 
 
 The following tests failed:
 
-  testIngestionWithFlare                             (1 failures, 4 skips)
-   test_12_UploadTextFromContributionTool (testIngestionWithFlare.TestIngestionWithFlare)
+  testConflictResolution                             (1 errors)
+   testActiveProcess (testConflictResolution.TestERP5)
 
 The following tests were at least partly skipped:
 
@@ -94,7 +94,6 @@
   testMaxmaDemoConfigurationWorkflow                 (1 skips)
 
   testOpenOrder                                      (3 skips)
-   testPeriodicityDateList (testOpenOrder.TestOpenOrder) ... skipped "can't run if machine timezone is UTC"
 
   testOrderBuilder                                   (4 skips)