From ad5ef5e28e74d4123963f9ea563f34a43d600800 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Fri, 4 May 2012 01:04:39 -0300
Subject: [PATCH] Rsvg-convert failures are not expected anymore.

With imagemagick providing a good support for rsvg-convert, those failures
are not expected anymore.
---
 product/ERP5/tests/testERP5WebWithDms.py | 11 -----------
 product/ERP5Form/tests/testOOoChart.py   |  3 ---
 2 files changed, 14 deletions(-)

diff --git a/product/ERP5/tests/testERP5WebWithDms.py b/product/ERP5/tests/testERP5WebWithDms.py
index a1a5cbff7e..977e80620b 100644
--- a/product/ERP5/tests/testERP5WebWithDms.py
+++ b/product/ERP5/tests/testERP5WebWithDms.py
@@ -40,7 +40,6 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase,\
      _getConversionServerDict
 from Products.ERP5Type.tests.utils import FileUpload, createZODBPythonScript
 from Products.ERP5.Document.Document import ConversionError
-from Products.ERP5Type.tests.backportUnittest import expectedFailure
 
 try:
   from PIL import Image
@@ -908,8 +907,6 @@ return True
     self.assertEquals(image.getContentType(), 'image/svg+xml')
     self.assertRaises(ConversionError, image.convert, "png")
 
-  # "Waiting for rsvg-convert be available for imagemagick"
-  @expectedFailure
   def test_ImageConversionFromSVGToPNG_embeeded_data(self):
     """ Test Convert one SVG Image with an image with the data
         at the url of the image tag.ie:
@@ -917,7 +914,6 @@ return True
     """
     self._testImageConversionFromSVGToPNG("Image")
 
-  @expectedFailure
   def test_FileConversionFromSVGToPNG_embeeded_data(self):
     """ Test Convert one SVG Image with an image with the data
         at the url of the image tag.ie:
@@ -925,7 +921,6 @@ return True
     """
     self._testImageConversionFromSVGToPNG("File")
   
-  @expectedFailure
   def test_WebPageConversionFromSVGToPNG_embeeded_data(self):
     """ Test Convert one SVG Image with an image with the data
         at the url of the image tag.ie:
@@ -958,7 +953,6 @@ return True
     """
     self._testImageConversionFromSVGToPNG_empty_file("File")
 
-  @expectedFailure
   def test_ImageConversionFromSVGToPNG_file_url(self):
     """ Test Convert one SVG Image with an image using local path (file)
         at the url of the image tag. ie:
@@ -969,7 +963,6 @@ return True
     """
     self._testImageConversionFromSVGToPNG_file_url("Image")
 
-  @expectedFailure
   def test_FileConversionFromSVGToPNG_file_url(self):
     """ Test Convert one SVG Image with an image using local path (file)
         at the url of the image tag. ie:
@@ -980,7 +973,6 @@ return True
     """
     self._testImageConversionFromSVGToPNG_file_url("File")
 
-  @expectedFailure
   def test_WebPageConversionFromSVGToPNG_file_url(self):
     """ Test Convert one SVG Image with an image using local path (file)
         at the url of the image tag. ie:
@@ -991,7 +983,6 @@ return True
     """
     self._testImageConversionFromSVGToPNG_file_url("Web Page")
 
-  @expectedFailure
   def test_ImageConversionFromSVGToPNG_http_url(self):
     """ Test Convert one SVG Image with an image with a full
         url at the url of the image tag. ie:
@@ -1000,7 +991,6 @@ return True
     self._testImageConversionFromSVGToPNG(
           "Image", "user-TESTSVG-CASE-FULLURL")
 
-  @expectedFailure
   def test_FileConversionFromSVGToPNG_http_url(self):
     """ Test Convert one SVG Image with an image with a full
         url at the url of the image tag. ie:
@@ -1009,7 +999,6 @@ return True
     self._testImageConversionFromSVGToPNG(
           "File", "user-TESTSVG-CASE-FULLURL")
 
-  @expectedFailure
   def test_WebPageConversionFromSVGToPNG_http_url(self):
     """ Test Convert one SVG Image with an image with a full
         url at the url of the image tag. ie:
diff --git a/product/ERP5Form/tests/testOOoChart.py b/product/ERP5Form/tests/testOOoChart.py
index f158844812..78ea785ab3 100644
--- a/product/ERP5Form/tests/testOOoChart.py
+++ b/product/ERP5Form/tests/testOOoChart.py
@@ -32,7 +32,6 @@ from Products.ERP5Form.Form import ERP5Form
 from DocumentTemplate import String
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.ERP5Type.tests.backportUnittest import expectedFailure
 from Products.ERP5Form.Selection import Selection
 from Testing import ZopeTestCase
 from Products.ERP5OOo.tests.utils import Validator
@@ -125,7 +124,6 @@ class TestOOoChart(ERP5TypeTestCase, ZopeTestCase.Functional):
       if error_list:
         self.fail(''.join(error_list))
 
-    @expectedFailure
     def test_ooo_chart(self):
       portal = self.getPortal()
       # Does the form exist ?
@@ -229,7 +227,6 @@ class TestOOoChart(ERP5TypeTestCase, ZopeTestCase.Functional):
       # Test Validation Relax NG
       self._validate(body)
 
-    @expectedFailure
     def test_proxy_ooo_chart(self):
       portal = self.getPortal()
       # Does the form exist ?
-- 
2.30.9