py3: No need decode/encode same string

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py

@@ -969,9 +969,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
 
   def generateSafeXml(self):
     return '<?xml version="1.0" encoding="utf-8"?><instance><parameter '\
-      'id="%s">%s</parameter></instance>' % \
-      ("paramé".decode("UTF-8").encode("UTF-8"),
-      self.generateNewId().decode("UTF-8").encode("UTF-8"))
+      'id="paramé">%s</parameter></instance>' % self.generateNewId()
 
   def generateEmptyXml(self):
     return '<?xml version="1.0" encoding="utf-8"?><instance></instance>'

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloud.py

@@ -897,9 +897,7 @@ class TestSlapOSCloudInstanceInvalidRequest(SlapOSTestCaseMixin):
 
   def generateUnsafeXml_bad_string(self):
     return '<?xml version="1.0" encoding="utf-8"?><instance><parameter '\
-      'id="%s">%s\x08</parameter></instance>' % \
-      ("paramé".decode("UTF-8").encode("UTF-8"),
-      self.generateNewId().decode("UTF-8").encode("UTF-8"))
+      'id="paramé">%s\x08</parameter></instance>' % self.generateNewId()
 
   def _test_invalid(self, title=None, instance_xml=None, sla_xml=None, shared=False):
     self._makeComputeNode(self.project)