software/slapos-testing: test re6stnet in python3.11

don't test it in python2 anymore

component/python-nemu3/buildout.cfg

+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+
+[python-nemu3-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+revision = 455179acc68326147b0c5007e9f80ab092ef4b02
+repository = https://lab.nexedi.com/nexedi/nemu3.git
+
+[python-nemu3]
+recipe = zc.recipe.egg:develop
+egg = nemu3
+setup = ${python-nemu3-repository:location}
+
+

software/slapos-testing/buildout.hash.cfg

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

software/slapos-testing/instance.cfg

@@ -91,17 +91,6 @@ repository = ${rubygemsrecipe-repository:location}
 <= download-source
 repository = ${re6stnet-repository:location}
 
-[re6stnet-test-runner]
-recipe = slapos.recipe.template:jinja2
-template = inline:#!/bin/sh
-  #change #!/usr/bin/python2 -> #!/real_python_path/bin/pythonVersion
-  sed '1s?/usr/bin/python2?${python:location}/bin/python${python:version}?' -i ${re6stnet-repository:location}/re6st/ovpn-*
-  # update files in /sys/class/net
-  mount -t sysfs sysfs /sys
-
-  python -m unittest discover -v
-rendered = $${re6stnet:location}/test-runner.sh
-
 [slapos-test-runner-nxdtest-environment.sh]
 recipe = slapos.recipe.template
 output = $${create-directory:etc}/$${:_buildout_section_name_}
@@ -120,6 +109,7 @@ output = $${:workdir}/.nxdtest
 workdir = $${create-directory:nxdtest-working-dir}
 inline =
   import six
+  import sys
   TestCase(
       "kedifa",
       ['python', '-m', 'unittest', 'discover', '-v'],
@@ -215,10 +205,10 @@ inline =
       cwd="""$${rubygemsrecipe:location}""",
       summaryf=UnitTest.summary,
   )
-  if six.PY2:
+  if sys.version_info >= (3,11):
     TestCase(
         "re6stnet",
-        ['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],
+        ['unshare', '-Umnr', 'python', '-m', 'unittest', 'discover', '-v'],
         cwd="""$${re6stnet:location}/re6st/tests""",
         summaryf=UnitTest.summary,
     )

software/slapos-testing/software-py2.cfg

@@ -5,9 +5,5 @@ extends =
 [python]
 part = python2.7
 
-[extra-eggs]
-eggs +=
-  ${re6stnet-setup:egg}
-
 [versions]
 pathlib = 1.0.1

software/slapos-testing/software-py3next.cfg

@@ -4,3 +4,7 @@ extends =
 
 [python3]
 <= python3.11
+
+[extra-eggs]
+eggs +=
+  ${re6stnet-setup:egg}

software/slapos-testing/software.cfg

@@ -9,6 +9,7 @@ extends =
   ../../component/zlib/buildout.cfg
   ../../component/phantomjs/buildout.cfg
   ../../component/pycurl/buildout.cfg
+  ../../component/python-nemu3/buildout.cfg
   ../../component/coreutils/buildout.cfg
   ../../component/socat/buildout.cfg
   ../../component/lmsensors/buildout.cfg
@@ -145,6 +146,7 @@ eggs +=
   ${lxml-python:egg}
   ${python-PyYAML:egg}
   ${python-cryptography:egg}
+  ${python-nemu3:egg}
   ${pycurl:egg}
   ${bcrypt:egg}
   ${kedifa-setup:egg}
@@ -281,6 +283,7 @@ zope.testing = 4.6.2
 iniparse = 0.5
 miniupnpc = 1.9
 nemu = 0.3.1
+nemu3 = 0.4
 multiping = 1.1.2
 python-passfd = 0.2
 python-unshare = 0.2

stack/slapos.cfg

@@ -336,6 +336,7 @@ typeguard = 3.0.2:whl
 typing-extensions = 4.8.0:whl
 tzlocal = 1.5.1
 unicodecsv = 0.14.1
+unshare = 0.22
 uritemplate = 4.1.1
 urllib3 = 1.26.12
 wcwidth = 0.2.5