.

component/ZODB/test-common.cfg

@@ -9,6 +9,7 @@ extends =
     ../pygolang/buildout.cfg
     ../python-manuel/buildout.cfg
     buildout-dev.cfg
+    ../ZEO/buildout.cfg
 
 parts =
     ZODB
@@ -28,7 +29,10 @@ depends += ${manuel:egg}
 # bin/python is preinstalled with sys.path to ZODB & friends.
 [ZODB-python]
 <= python-interpreter
-eggs += ${ZODB:egg}[test]
+eggs +=
+  ${ZODB:egg}[test]
+  ${ZEO:egg}[test]
+  transaction[test]
 
 # env.sh for ZODB's python to be on $PATH.
 [ZODB-env.sh]
@@ -39,13 +43,32 @@ template = inline:
   export PATH=${buildout:bin-directory}:$PATH
 
 # .nxdtest to run ZODB tests
-# XXX +persistent/BTree/transaction?
 [.nxdtest]
 <= jinja2-template
 template = inline:
-  ZODB = '${ZODB:location}'
-  TestCase('unit',       ['python', '-m', 'zope.testrunner', '-uv', '--test-path=src'], cwd=ZODB)
-  TestCase('functional', ['python', '-m', 'zope.testrunner', '-fv', '--test-path=src'], cwd=ZODB)
+  # determine where ZODB & friends were installed
+  from subprocess import check_output
+  _ = check_output(['python', '-c',
+                    'from os.path import dirname\n'+
+                    'def X(mod): m=__import__(mod); print(dirname(m.__file__))\n\n'+
+                    'X("ZODB"); X("persistent"); X("BTrees"); X("transaction"), X("ZEO")'])
+  ZODB, persistent, BTrees, transaction, ZEO = _.split()
+
+  # run tests for whole ZODB stack
+  TestCase('ZODB/unit',       ['python', '-m', 'zope.testrunner', '-uv', '--package-path', ZODB, 'ZODB'])
+  TestCase('ZODB/functional', ['python', '-m', 'zope.testrunner', '-fv', '--package-path', ZODB, 'ZODB'])
+
+  TestCase('ZEO/unit',       ['python', '-m', 'zope.testrunner', '-uv', '--package-path', ZEO, 'ZEO'])
+  TestCase('ZEO/functional', ['python', '-m', 'zope.testrunner', '-fv', '--package-path', ZEO, 'ZEO'])
+
+  TestCase('persistent', ['python', '-m', 'zope.testrunner', '-v', '--package-path', persistent, 'persistent'])
+  TestCase('BTrees',     ['python', '-m', 'zope.testrunner', '-v', '--package-path', BTrees, 'BTrees'])
+
+  # transaction uses unittest instead of zope.testrunner
+  import os.path
+  def P(path): return os.path.join(path, '..')
+  TestCase('transaction',['python', '-m', 'unittest', 'discover', '-s', P(transaction)])
+
 
 
 # instance to run nxdtest.

component/wendelin.core/test-common.cfg

@@ -57,5 +57,4 @@ template = inline:
 [versions]
 neoppod = 1.12.0
 
-random2 = 1.0.1
 manuel = 1.10.1

stack/slapos.cfg

@@ -186,6 +186,7 @@ py = 1.9.0
 pyOpenSSL = 19.1.0
 pyparsing = 2.2.0
 pytz = 2016.10
+random2 = 1.0.1
 regex = 2020.9.27
 requests = 2.24.0
 scandir = 1.10.0