py3

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 5f5378550470b551d280dd432878a0ba
+md5sum = eaf037ce345f0f5512eda1fc6039a9e0

software/slapos-testing/instance.cfg

@@ -120,108 +120,107 @@ output = $${:workdir}/.nxdtest
 workdir = $${create-directory:nxdtest-working-dir}
 inline =
   import six
+  #TestCase(
+  #    "kedifa",
+  #    ['python', '-m', 'unittest', 'discover', '-v'],
+  #    cwd="""$${kedifa:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "caucase",
+  #    ['$${caucase-test-runner:output}'],
+  #    cwd="""$${caucase:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "erp5.util",
+  #    ['python', '-m', 'unittest', 'discover', '-v', '--start', 'erp5/tests/'],
+  #    cwd="""$${erp5.util:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "slapos.cookbook",
+  #    # slapos/test contain both tests for recipes and tests for
+  #    # json schemas, we only care about recipe tests here, json
+  #    # schemas are tested in software/slapos-sr-testing
+  #    ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test/recipe'],
+  #    cwd="""$${slapos.cookbook:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "slapos.core",
+  #    # ['python', '-m', 'unittest', 'discover', '-v'],
+  #    # XXX some test fail when running with unittest (slapos*.cfg.example
+  #    # files cannot be found with pkg_resources.resource_string), so we keep
+  #    # using setup.py test for now.
+  #    ['python', 'setup.py', 'test'],
+  #    cwd="""$${slapos.core:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "slapos.recipe.build",
+  #    ['python', '-m', 'unittest', 'discover', '-v'],
+  #    cwd="""$${slapos.recipe.build:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "slapos.recipe.cmmi",
+  #    ['python', '-m', 'unittest', 'discover', '-v'],
+  #    cwd="""$${slapos.recipe.cmmi:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "slapos.recipe.template",
+  #    # ['python', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'],
+  #    # XXX some test fail when running with unittest, so we keep using setup.py test
+  #    ['python', 'setup.py', 'test'],
+  #    cwd="""$${slapos.recipe.template:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #if six.PY3:
+  #  TestCase(
+  #      "slapos.toolbox",
+  #      # ['python', '-m', 'unittest', 'discover', '-v'],
+  #      # XXX We can not just run unittest discover here, since slapos/lamp
+  #      # imports MySQLDb and we currently don't have installed
+  #      # slapos.toolbox[lampconfigure] and on python3 discovery make a
+  #      # failing test for this import error.
+  #      # Currently slapos/lamp is not tested, but if it it is still used,
+  #      # the TODO seem to also install slapos.toolbox[lampconfigure] here.
+  #      ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
+  #      cwd="""$${slapos.toolbox:location}""",
+  #      summaryf=UnitTest.summary,
+  #  )
+  #TestCase(
+  #    "slapos.libnetworkcache",
+  #    ['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'],
+  #    cwd="""$${slapos.libnetworkcache:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "slapcache",
+  #    ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapcache/test'],
+  #    cwd="""$${slapcache:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "slapos.rebootstrap",
+  #    ['python', '-m', 'unittest', '-v', 'slapos.rebootstrap.tests.test_suite'],
+  #    cwd="""$${slapos.rebootstrap:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
+  #TestCase(
+  #    "rubygemsrecipe",
+  #    ['python', '-m', 'unittest', 'discover', '-v'],
+  #    cwd="""$${rubygemsrecipe:location}""",
+  #    summaryf=UnitTest.summary,
+  #)
   TestCase(
-      "kedifa",
-      ['python', '-m', 'unittest', 'discover', '-v'],
-      cwd="""$${kedifa:location}""",
+      "re6stnet",
+      ['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],
+      cwd="""$${re6stnet:location}/re6st/tests""",
       summaryf=UnitTest.summary,
   )
-  TestCase(
-      "caucase",
-      ['$${caucase-test-runner:output}'],
-      cwd="""$${caucase:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "erp5.util",
-      ['python', '-m', 'unittest', 'discover', '-v', '--start', 'erp5/tests/'],
-      cwd="""$${erp5.util:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "slapos.cookbook",
-      # slapos/test contain both tests for recipes and tests for
-      # json schemas, we only care about recipe tests here, json
-      # schemas are tested in software/slapos-sr-testing
-      ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test/recipe'],
-      cwd="""$${slapos.cookbook:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "slapos.core",
-      # ['python', '-m', 'unittest', 'discover', '-v'],
-      # XXX some test fail when running with unittest (slapos*.cfg.example
-      # files cannot be found with pkg_resources.resource_string), so we keep
-      # using setup.py test for now.
-      ['python', 'setup.py', 'test'],
-      cwd="""$${slapos.core:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "slapos.recipe.build",
-      ['python', '-m', 'unittest', 'discover', '-v'],
-      cwd="""$${slapos.recipe.build:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "slapos.recipe.cmmi",
-      ['python', '-m', 'unittest', 'discover', '-v'],
-      cwd="""$${slapos.recipe.cmmi:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "slapos.recipe.template",
-      # ['python', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'],
-      # XXX some test fail when running with unittest, so we keep using setup.py test
-      ['python', 'setup.py', 'test'],
-      cwd="""$${slapos.recipe.template:location}""",
-      summaryf=UnitTest.summary,
-  )
-  if six.PY3:
-    TestCase(
-        "slapos.toolbox",
-        # ['python', '-m', 'unittest', 'discover', '-v'],
-        # XXX We can not just run unittest discover here, since slapos/lamp
-        # imports MySQLDb and we currently don't have installed
-        # slapos.toolbox[lampconfigure] and on python3 discovery make a
-        # failing test for this import error.
-        # Currently slapos/lamp is not tested, but if it it is still used,
-        # the TODO seem to also install slapos.toolbox[lampconfigure] here.
-        ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
-        cwd="""$${slapos.toolbox:location}""",
-        summaryf=UnitTest.summary,
-    )
-  TestCase(
-      "slapos.libnetworkcache",
-      ['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'],
-      cwd="""$${slapos.libnetworkcache:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "slapcache",
-      ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapcache/test'],
-      cwd="""$${slapcache:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "slapos.rebootstrap",
-      ['python', '-m', 'unittest', '-v', 'slapos.rebootstrap.tests.test_suite'],
-      cwd="""$${slapos.rebootstrap:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "rubygemsrecipe",
-      ['python', '-m', 'unittest', 'discover', '-v'],
-      cwd="""$${rubygemsrecipe:location}""",
-      summaryf=UnitTest.summary,
-  )
-  if six.PY2:
-    TestCase(
-        "re6stnet",
-        ['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],
-        cwd="""$${re6stnet:location}/re6st/tests""",
-        summaryf=UnitTest.summary,
-    )
 
 
 [runTestSuite]

software/slapos-testing/software.cfg

@@ -138,6 +138,7 @@ eggs =
 [eggs]
 <= python-interpreter
 eggs +=
+  ${extra-eggs:eggs}
   ${lxml-python:egg}
   ${python-PyYAML:egg}
   ${python-cryptography:egg}
@@ -155,12 +156,13 @@ eggs +=
   ${slapos.libnetworkcache-setup:egg}
   ${slapcache-setup:egg}
   ${slapos.rebootstrap-setup:egg}
+  ${re6stnet-setup:egg}
   ${rubygemsrecipe-setup:egg}
   ${pandas:egg}
   ${statsmodels:egg}
   ${scipy:egg}
   zope.testing
-  ${extra-eggs:eggs}
+  supervisor
 
 [eggs/scripts]
 recipe = zc.recipe.egg
@@ -239,6 +241,7 @@ repository = https://lab.nexedi.com/nexedi/rubygemsrecipe.git
 [re6stnet-repository]
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/re6stnet.git
+branch = re6st-py3
 
 [template]
 recipe = slapos.recipe.template