--- summary
+++ summary
@@ -1,15 +1,15 @@
 Test Suite: ERP5-MASTER
-Revision: slapos.cookbook=10855-29b2d7cc1421f95e071e51223f8417b2756ad053,erp5=49655-405ee70eb14a2cdd580e850512957efcec0f0ea2
+Revision: slapos.cookbook=10860-f427842b5b6f7b66e4b4bb9974f17a1493ffea47,erp5=49655-405ee70eb14a2cdd580e850512957efcec0f0ea2
 Result: FAIL
 
 Building Failed
 
 All tests: 5985
-Failures: 6
-Errors: 0
-Skips: 201
-
- https://nexedi.erp5.net/test_result_module/20181026-81D7DDE5/view
+Failures: 7
+Errors: 2
+Skips: 202
+
+ https://nexedi.erp5.net/test_result_module/20181026-6A41738E/view
 
 
 The following tests failed:
@@ -20,8 +20,15 @@
   erp5_officejs_ui_test:testFunctionalOfficeJSoOoSpreadsheet (1 failures)
    testFunctionalTestRunner (erp5.component.test.erp5_version.testFunctionalOfficeJSoOoSpreadsheet.TestOfficejSUIoOoSpreadsheet)
 
+  erp5_web_renderjs_ui_test:testFunctionalRJSListbox (1 failures)
+   testFunctionalTestRunner (erp5.component.test.erp5_version.testFunctionalRJSListbox.TestRenderJSUIListbox)
+
   testFunctionalConfigurator                         (1 failures)
    testFunctionalTestRunner (testFunctionalConfigurator.TestZeleniumConfiguratorStandard)
+
+  test_conflict_resolution:testConflictResolution    (2 errors)
+   testActiveProcess (erp5.component.test.erp5_version.testConflictResolution.TestERP5)
+   testZODBCookie (erp5.component.test.erp5_version.testConflictResolution.TestERP5)
 
 The following tests were at least partly skipped:
 
@@ -34,6 +41,8 @@
    test_getHateoas_drop_restricted (erp5.component.test.erp5_version.testHalJsonStyle.TestERP5Document_getHateoas_general) ... skipped 'TODO'
 
   erp5_officejs_ui_test:testFunctionalOfficeJSMediaPlayer (1 skips)
+
+  erp5_officejs_ui_test:testFunctionalOfficeJSNotebook (1 skips)
 
   erp5_web_monitoring_ui_test:testFunctionalOfficejsMonitoring (1 skips)