Commit 3663dbab authored by Sven Franck's avatar Sven Franck

erp5_corporate_identity: remove softinst references

parent 23d2d9f7
...@@ -37,9 +37,6 @@ import re ...@@ -37,9 +37,6 @@ import re
import io import io
import base64 import base64
host_url = r"https?://localhost(?::[0-9]+)?/[^/]+/"
test_url = "https://softinst73908.host.vifib.net/erp5/"
def changeSkin(skin_name): def changeSkin(skin_name):
""" """
Change skin for following commands and attribute resolution. Change skin for following commands and attribute resolution.
...@@ -225,11 +222,11 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -225,11 +222,11 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
getattr(test_page, kw.get("test_method")), getattr(test_page, kw.get("test_method")),
**kw **kw
) )
html = re.sub(host_url, test_url, html)
# update html test files or run tests # update html test files or run tests
if dump: if dump:
expected_page.edit(text_content=html) expected_page.edit(text_content=html)
self.tic()
self.assertEquals(html, expected_page.getData()) self.assertEquals(html, expected_page.getData())
def runPdfTestPattern(self, id1, id2, id3, **kw): def runPdfTestPattern(self, id1, id2, id3, **kw):
...@@ -264,6 +261,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -264,6 +261,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
# update bmp files # update bmp files
if dump: if dump:
expected_image.setData(bmp) expected_image.setData(bmp)
self.tic()
self.assertImageRenderingEquals(str(bmp), str(expected_image.getData())) self.assertImageRenderingEquals(str(bmp), str(expected_image.getData()))
############################################################################## ##############################################################################
...@@ -557,7 +555,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -557,7 +555,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
use_skin="Letter" use_skin="Letter"
) )
) )
@changeSkin('Letter') @changeSkin('Letter')
def test_htmlLetterFollowUpContributor(self): def test_htmlLetterFollowUpContributor(self):
""" """
...@@ -692,7 +690,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -692,7 +690,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
subfield_field_override_date_day="31" subfield_field_override_date_day="31"
) )
) )
@changeSkin('Letter') @changeSkin('Letter')
def test_pdfLetterLocaliserHeadDisplay(self): def test_pdfLetterLocaliserHeadDisplay(self):
""" """
...@@ -751,7 +749,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -751,7 +749,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
use_skin="Leaflet" use_skin="Leaflet"
) )
) )
@changeSkin('Leaflet') @changeSkin('Leaflet')
def test_htmlLeafletOverrides(self): def test_htmlLeafletOverrides(self):
""" """
...@@ -789,7 +787,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -789,7 +787,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
use_skin="Leaflet" use_skin="Leaflet"
) )
) )
@changeSkin('Leaflet') @changeSkin('Leaflet')
def test_pdfLeaflet(self): def test_pdfLeaflet(self):
""" """
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<string>W: 30, 0: Unused createZODBPythonScript imported from Products.ERP5Type.tests.utils (unused-import)</string> <string>W: 30, 0: Unused createZODBPythonScript imported from Products.ERP5Type.tests.utils (unused-import)</string>
<string>W: 32, 0: Unused import transaction (unused-import)</string> <string>W: 32, 0: Unused import transaction (unused-import)</string>
<string>W: 33, 0: Unused import functools (unused-import)</string> <string>W: 33, 0: Unused import functools (unused-import)</string>
<string>W: 36, 0: Unused import re (unused-import)</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment