erp5: adjust runUnitTest and runTestSuite to use pygolang pyprog

stack/erp5/buildout.cfg

@@ -78,8 +78,8 @@ parts +=
 
 # Buildoutish
   eggs-all-scripts
-  testrunner
-  test-suite-runner
+  runUnitTest
+  runTestSuite
 
 # get git repositories
   genbt5list
@@ -358,15 +358,9 @@ repository = https://lab.nexedi.com/nexedi/erp5.git
 branch = master
 git-executable = ${git:location}/bin/git
 
-[testrunner]
-# XXX: Workaround for fact ERP5Type is not an distribution and does not
-#      expose entry point for test runner
-recipe = zc.recipe.egg
-eggs = ${eggs:eggs}
-extra-paths = ${eggs:extra-paths}
-entry-points =
-  runUnitTest=runUnitTest:main
-scripts = runUnitTest
+[runUnitTest]
+<= erp5-pyprog
+entry = runUnitTest:main
 initialization =
   import glob, os, sys, json
   buildout_directory = '''${buildout:directory}'''
@@ -443,15 +437,9 @@ initialization =
           test_name)
 
 
-[test-suite-runner]
-# XXX: Workaround for fact ERP5Type is not an distribution and does not
-#      expose entry point for test runner
-recipe = zc.recipe.egg
-eggs = ${eggs:eggs}
-extra-paths = ${eggs:extra-paths}
-entry-points =
-  runTestSuite=Products.ERP5Type.tests.runTestSuite:main
-scripts = runTestSuite
+[runTestSuite]
+<= erp5-pyprog
+entry = Products.ERP5Type.tests.runTestSuite:main
 initialization =
   import os
   import sys
@@ -483,6 +471,7 @@ exe = ${buildout:bin-directory}/${:_buildout_section_name_}
 python-interpreter = erp5-python-interpreter
 # by default no need for extra eggs in addition to eggs provided by interpreter
 eggs =
+extra-paths += ${eggs:extra-paths}
 
 [erp5-python-interpreter-jupyter]
 <= erp5-python-interpreter