fixup! software/slapos-sr-testing: WIP use nxdtest

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

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = db000a8e7be5887b2a6c64b24739a40a
+md5sum = 6e3d27c900eac44df06b14e9da9d5d2e

software/slapos-sr-testing/instance.cfg

@@ -34,7 +34,7 @@ nxdtest-working-dir = ${:var}/nxdtest
 
 
 [slapos-test-runner-environment]
-PATH = {{ buildout['bin-directory'] }}:{{ curl_location }}/bin/:{{ faketime_location }}/bin/:{{ openssl_location }}/bin/:/usr/bin/:/bin
+PATH = {{ buildout['bin-directory'] }}:{{ curl_location }}/bin/:{{ faketime_location }}/bin/:{{ openssl_location }}/bin/:$PATH
 SLAPOS_TEST_IPV4 = ${slap-configuration:ipv4-random}
 SLAPOS_TEST_IPV6 = ${slap-configuration:ipv6-random}
 SLAPOS_TEST_WORKING_DIR = ${directory:test-working-dir}
@@ -57,7 +57,7 @@ template = inline:
     # TODO: switch to python -m unittest
     # TODO: wrong summary ?
     # XXX debug: {{ test }}
-    TestCase( """{{ test.split()[0] }}""", ["""{{ interpreter }}""", 'setup.py', 'test'], cwd="""{{ test.split()[1] }}""", summaryf=PyTest.summary)
+    TestCase( """{{ test.split()[0] }}""", ["""{{ interpreter }}""", '-m', 'unittest', '--', 'discover', '-v'], cwd="""{{ test.split()[1] }}""", summaryf=PyTest.summary)
   {% endfor %}
 
 [runTestSuite]
@@ -69,7 +69,7 @@ workdir = ${slapos-test-runner-dot-nxdtest:workdir}
 recipe = slapos.recipe.template:jinja2
 rendered = ${directory:etc}/${:_buildout_section_name_}
 template = inline:
-  export PATH=${slapos-test-runner-environment:PATH}:$PATH
+  export PATH=${slapos-test-runner-environment:PATH}
   export SLAPOS_TEST_IPV4=${slapos-test-runner-environment:SLAPOS_TEST_IPV4}
   export SLAPOS_TEST_IPV6=${slapos-test-runner-environment:SLAPOS_TEST_IPV6}
   export SLAPOS_TEST_WORKING_DIR=${slapos-test-runner-environment:SLAPOS_TEST_WORKING_DIR}