From 635f768d9394356aa9b0d1cd4e2041beddeebec1 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Wed, 22 Dec 2010 14:54:02 +0000 Subject: [PATCH] Depending of Language local settings of openoffice instance, the size values can be converted from centimeter to inch. Add support of this value. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41670 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5OOo/tests/testFormPrintoutAsODT.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/product/ERP5OOo/tests/testFormPrintoutAsODT.py b/product/ERP5OOo/tests/testFormPrintoutAsODT.py index 1b72c080a5..f3fb50c5b7 100644 --- a/product/ERP5OOo/tests/testFormPrintoutAsODT.py +++ b/product/ERP5OOo/tests/testFormPrintoutAsODT.py @@ -1138,10 +1138,10 @@ return [] image_frame_list = content.xpath(image_frame_xpath, namespaces=content.nsmap) self.assertTrue(len(image_frame_list) > 0) image_frame = image_frame_list[0] - self.assertEqual(image_frame.attrib['{%s}height' % content.nsmap['svg']], - '0.838cm') - self.assertEqual(image_frame.attrib['{%s}width' % content.nsmap['svg']], - '0.838cm') + height = image_frame.attrib['{%s}height' % content.nsmap['svg']] + self.assertTrue(height in ('0.838cm', '0.3299in')) + width = image_frame.attrib['{%s}width' % content.nsmap['svg']] + self.assertTrue(width in ('0.838cm', '0.3299in')) self._validate(odf_document) # 02: no image data -- 2.30.9