erp5/zope4py3: Allow slapos-sr-testing with slapos-py2.

software/erp5/test/test/__init__.py

@@ -29,15 +29,13 @@ from __future__ import absolute_import
 import json
 import os
 
-import six
-
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 
 _setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..', '..',
-                     '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/instance.cfg

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

software/slapos-sr-testing/software-py3.cfg

@@ -13,6 +13,7 @@ extra-eggs +=
 [template]
 extra =
 # The following list is for SR whose buildout runs only with Python 3.
+  erp5-py3 ${slapos.test.erp5-setup:setup}
   galene ${slapos.test.galene-setup:setup}
   helloworld ${slapos.test.helloworld-setup:setup}
   jupyter ${slapos.test.jupyter-setup:setup}