.

component/pygolang/test/software.cfg

@@ -5,6 +5,7 @@ extends =
     ../../../stack/nxdtest.cfg
     ../buildout-dev.cfg
 
+# XXX kill pygolang (used by python)
 parts =
     pygolang
     gpython
@@ -16,9 +17,26 @@ parts =
 
 # XXX correct ?
 [pygolang]
-eggs	+= pygolang[all_test]
+eggs += pygolang[all_test]
+
+# install python with sys.path to eggs
+# use gpython, instead of pygolang, since interpreter works only for regular
+# zc.recipe.egg, not zc.recipe.egg:custom XXX
+# the `python` interreter will just set sys.path to pygolang, not activate gevent
+[gpython]
+interpreter = python
+
+[pygolang-env.sh]
+recipe	= slapos.recipe.template:jinja2
+rendered= ${buildout:directory}/${:_buildout_section_name_}
+template= inline:
+  PATH=${buildout:bin-directory}:$PATH
+  # XXX python with eggs
 
 
 # XXX needed? -> move to stack/nxdtest completely?
 [instance.cfg]
 <= nxdtest-instance.cfg
+
+env.sh  = ${pygolang-env.sh:rendered}
+workdir = ${pygolang-repository:location}

software/neotest/neotest-runTestSuite.in

@@ -2,4 +2,4 @@
 # neotest's runTestSuite wraper so it could be run without any environment preset
 
 . ${buildout:directory}/neotest-env.sh
-exec ${gowork:src}/lab.nexedi.com/kirr/neo/go/neo/t/nxd/runTestSuite "$@"
+exec nxdtest ${gowork:src}/lab.nexedi.com/kirr/neo/go/neo/t/.nxdtest "$@"

stack/nxdtest.cfg

@@ -21,6 +21,8 @@ mode    = 0644
 context =
   section buildout  buildout
   section nxdtest   nxdtest
+  key     env_sh    :env.sh
+# XXX env.sh - must be provided by user		XXX or default empty?
 
 
 [nxdtest]

stack/nxdtest/instance.cfg.in

@@ -24,5 +24,5 @@ t       = ${:home}/t
 [runTestSuite]
 recipe  = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/${:_buildout_section_name_}
-command-line = /bin/bash -c 'cd ${directory:t} && {{ nxdtest['exe'] }} "$@"' nxdtest
+command-line = /bin/bash -c '. {{ env_sh }} && cd ${directory:t} && {{ nxdtest['exe'] }} "$@"' nxdtest
 # "$@" is implicitly added to argv