software/slapos-sr-testing: add erp5-py3

software/erp5/test/test/__init__.py

@@ -35,7 +35,8 @@ from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 _setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..', '..', 'software.cfg')))                 'software%s.cfg' % ("-py3" if six.PY3 else ""))))
+        os.path.join(os.path.dirname(__file__), '..', '..', 'software%s.cfg' % (
+          '-py3' if os.environ['SLAPOS_SR_TEST_NAME'] == 'erp5-py3' else ''))))
 
 
 setup_module_executed = False

software/slapos-sr-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 06379c0ed1fe0df409c7b8f61fc218eb
+md5sum = 7335519fd8b86c1cc0ab0de04f753dc2

software/slapos-sr-testing/instance.cfg

@@ -60,6 +60,7 @@ inline =
     command,
     cwd={{ repr(folder) }},
     summaryf=UnitTest.summary,
+    envadj={ 'SLAPOS_SR_TEST_NAME': {{ repr(name) }} },
   )
   {%-   endif %}
   {%- endfor %}

software/slapos-sr-testing/software.cfg

@@ -408,6 +408,7 @@ tests =
   dream ${slapos.test.dream-setup:setup}
   dufs ${slapos.test.dufs-setup:setup}
   erp5 ${slapos.test.erp5-setup:setup}
+  erp5-py3 ${slapos.test.erp5-setup:setup}
   erp5testnode ${slapos.test.erp5testnode-setup:setup}
   fluentd ${slapos.test.fluentd-setup:setup}
   galene ${slapos.test.galene-setup:setup}