Use skip only.

expectedFailure can result in divergent documents, and it is impossible to
fine tune workflow divergence checking.

Anyway skip and excepted failure has same outcome: ignored the test result, and
skip just do not run the test.

master/product/Vifib/tests/testVifibSlapBang.py

 from Products.ERP5Type.tests.backportUnittest import skip
 from Products.ERP5Type.tests.Sequence import SequenceList
 import unittest
-from Products.ERP5Type.tests.backportUnittest import expectedFailure
 from slapos import slap
 from testVifibSlapWebService import TestVifibSlapWebServiceMixin
 from random import random
@@ -301,7 +300,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
     sequence_list.play(self)
 
   # Computer owner cannot do bang yet
-  @expectedFailure
+  @skip
   def test_admin_bang_computer_complex_tree(self):
     """Checks that bangs works on complex tree
 

master/product/Vifib/tests/testVifibSlapComputerGetComputerPartitionList.py

 from Products.ERP5Type.tests.Sequence import SequenceList
-from Products.ERP5Type.tests.backportUnittest import expectedFailure
+from Products.ERP5Type.tests.backportUnittest import skip
 import transaction
 import unittest
 from testVifibSlapWebService import TestVifibSlapWebServiceMixin
@@ -50,9 +50,8 @@ class TestVifibSlapComputerGetComputerPartitionList(TestVifibSlapWebServiceMixin
     self.computer_partition_amount = 2
     self.test_Computer_getComputerPartitionList_emptyPartition()
 
-  # ERP5/Zope does not follow REST API beacuse it is not possible to configure
-  # Cookie Crumbler to ignore portal_slap
-  @expectedFailure
+  @skip('ERP5/Zope does not follow REST API beacuse it is not possible to '
+    'configure  Cookie Crumbler to ignore portal_slap')
   def test_Computer_getComputerPartitionList_unknowComputerUid(self):
     sequence_list = SequenceList()
     sequence_string = '\
@@ -66,9 +65,8 @@ class TestVifibSlapComputerGetComputerPartitionList(TestVifibSlapWebServiceMixin
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self)
 
-  # ERP5/Zope does not follow REST API beacuse it is not possible to configure
-  # Cookie Crumbler to ignore portal_slap
-  @expectedFailure
+  @skip('ERP5/Zope does not follow REST API beacuse it is not possible to '
+    'configure  Cookie Crumbler to ignore portal_slap')
   def test_Computer_getComputerPartitionList_draftComputer(self):
     sequence_list = SequenceList()
     sequence_string = '\
@@ -109,9 +107,8 @@ class TestVifibSlapComputerGetComputerPartitionList(TestVifibSlapWebServiceMixin
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self)
 
-  # ERP5/Zope does not follow REST API beacuse it is not possible to configure
-  # Cookie Crumbler to ignore portal_slap
-  @expectedFailure
+  @skip('ERP5/Zope does not follow REST API beacuse it is not possible to '
+    'configure  Cookie Crumbler to ignore portal_slap')
   def test_Computer_getComputerPartitionList_TwoValidatedComputer(self):
     # XXX: It shall be part of VifibMachineAuthentication test suite
     sequence_list = SequenceList()

master/product/Vifib/tests/testVifibSlapComputerGetSoftwareReleaseList.py

 from Products.ERP5Type.tests.Sequence import SequenceList
-from Products.ERP5Type.tests.backportUnittest import expectedFailure
+from Products.ERP5Type.tests.backportUnittest import skip
 import transaction
 import unittest
 from testVifibSlapWebService import TestVifibSlapWebServiceMixin
@@ -9,9 +9,8 @@ class TestVifibSlapComputerGetSoftwareReleaseList(TestVifibSlapWebServiceMixin):
   # Computer.getSoftwareReleaseList
   ########################################
 
-  # ERP5/Zope does not follow REST API beacuse it is not possible to configure
-  # Cookie Crumbler to ignore portal_slap
-  @expectedFailure
+  @skip('ERP5/Zope does not follow REST API beacuse it is not possible to '
+    'configure  Cookie Crumbler to ignore portal_slap')
   def test_Computer_getSoftwareReleaseList_unknowComputerUid(self):
     sequence_list = SequenceList()
     sequence_string = '\
@@ -27,9 +26,8 @@ class TestVifibSlapComputerGetSoftwareReleaseList(TestVifibSlapWebServiceMixin):
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self)
 
-  # ERP5/Zope does not follow REST API beacuse it is not possible to configure
-  # Cookie Crumbler to ignore portal_slap
-  @expectedFailure
+  @skip('ERP5/Zope does not follow REST API beacuse it is not possible to '
+    'configure  Cookie Crumbler to ignore portal_slap')
   def test_Computer_getSoftwareReleaseList_draftComputer(self):
     sequence_list = SequenceList()
     sequence_string = '\
@@ -88,9 +86,8 @@ class TestVifibSlapComputerGetSoftwareReleaseList(TestVifibSlapWebServiceMixin):
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self)
 
-  # ERP5/Zope does not follow REST API beacuse it is not possible to configure
-  # Cookie Crumbler to ignore portal_slap
-  @expectedFailure
+  @skip('ERP5/Zope does not follow REST API beacuse it is not possible to '
+    'configure  Cookie Crumbler to ignore portal_slap')
   def test_Computer_getSoftwareReleaseList_TwoValidatedComputer(self):
     # XXX: It shall be part of VifibMachineAuthentication test suite
     sequence_list = SequenceList()

master/product/Vifib/tests/testVifibSlapComputerPartitionRequest.py

 from Products.ERP5Type.tests.Sequence import SequenceList
-from Products.ERP5Type.tests.backportUnittest import expectedFailure
+from Products.ERP5Type.tests.backportUnittest import skip
 import urllib
 import urlparse
 import httplib
@@ -353,10 +353,9 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self)
 
-  # XXX: This test fails because test_vifib_customer security is cached
-  #      and this user is not in SOFTINST-x group. We do not want to clear
-  #      cache in tests.
-  @expectedFailure
+  @skip('This test fails because test_vifib_customer security is cached '
+    'and this user is not in SOFTINST-x group. We do not want to clear '
+    'cache in tests.')
   def test_ComputerPartition_request_instantiateStop(self):
     """
     Check that after computer partition is requested it is possible to
@@ -715,8 +714,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self)
 
-  # Marked as expectedFailure as implementation is not ready yet
-  @expectedFailure
+  @skip('Implementation is not ready yet')
   def test_ComputerPartition_request_twiceDifferentParentWithoutTic(self):
     """
     Checks that requesting twice with same arguments from different Computer
@@ -837,8 +835,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self)
 
-  # Marked as expectedFailure as implementation is not ready yet
-  @expectedFailure
+  @skip('Implementation is not ready yet.')
   def test_ComputerPartition_request_differentSourceDifferentResultWithoutTic(
       self):
     """

master/product/Vifib/tests/testVifibSlapRegisterComputerPartition.py

 from Products.ERP5Type.tests.Sequence import SequenceList
-from Products.ERP5Type.tests.backportUnittest import expectedFailure
+from Products.ERP5Type.tests.backportUnittest import skip
 import unittest
 from testVifibSlapWebService import TestVifibSlapWebServiceMixin
 
@@ -8,9 +8,8 @@ class TestVifibSlapRegisterComputerPartition(TestVifibSlapWebServiceMixin):
   # slap.registerComputerPartition
   ########################################
 
-  # ERP5/Zope does not follow REST API beacuse it is not possible to configure
-  # Cookie Crumbler to ignore portal_slap
-  @expectedFailure
+  @skip('ERP5/Zope does not follow REST API beacuse it is not possible to '
+    'configure  Cookie Crumbler to ignore portal_slap')
   def test_slap_registerComputerPartition_unknowComputerUid(self):
     """
     Check the slap.registerComputerPartition without any Computer document
@@ -30,9 +29,8 @@ class TestVifibSlapRegisterComputerPartition(TestVifibSlapWebServiceMixin):
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self)
 
-  # ERP5/Zope does not follow REST API beacuse it is not possible to configure
-  # Cookie Crumbler to ignore portal_slap
-  @expectedFailure
+  @skip('ERP5/Zope does not follow REST API beacuse it is not possible to '
+    'configure  Cookie Crumbler to ignore portal_slap')
   def test_slap_registerComputerPartition_draftComputer(self):
     """
     Check the slap.registerComputerPartition fails

master/product/Vifib/tests/testVifibSoftwareInstance.py

-from Products.ERP5Type.tests.backportUnittest import expectedFailure
+from Products.ERP5Type.tests.backportUnittest import skip
 import unittest
 from VifibMixin import testVifibMixin
 
@@ -65,8 +65,7 @@ class TestVifibSoftwareInstance(testVifibMixin):
     self.assertRaises(DisconnectedSoftwareTree, self.checkConnected, graph,
       root)
 
-  # For now limitation of implementation gives false positive
-  @expectedFailure
+  @skip('For now limitation of implementation gives false positive')
   def test_si_tree_cyclic_connected(self):
     """Cyclic is connected
 

master/product/Vifib/tests/testVifibXHTML.py

@@ -28,7 +28,7 @@
 ##############################################################################
 import unittest
 from VifibMixin import testVifibMixin
-from Products.ERP5Type.tests.backportUnittest import expectedFailure
+from Products.ERP5Type.tests.backportUnittest import skip
 
 class TestVifibXHTML(testVifibMixin):
   run_all_test = 1
@@ -112,7 +112,7 @@ class TestVifibXHTML(testVifibMixin):
               error_list.append(form_path)
     self.assertEquals(error_list, [])
 
-  @expectedFailure
+  @skip
   def test_configurationOfFieldLibrary(self):
     self.login()
     error_list = []