Commit 040a3ce8 authored by Julien Muchembled's avatar Julien Muchembled

buildout-testing: update manuel to fix test detection in Python 2

parent 7a325c69
[buildout]
extends = ../patch/buildout.cfg
parts = manuel
[manuel]
recipe = zc.recipe.egg
egg = manuel
find-links = https://github.com/benji-york/manuel/tarball/${:revision}/manuel-${versions:manuel}.tar.gz
revision = aeea5ce7e853b8dabb815efb83141c6ddeb62904
[versions]
manuel = 1.10.2.dev0
...@@ -4,6 +4,7 @@ import argparse, os, re, subprocess, sys ...@@ -4,6 +4,7 @@ import argparse, os, re, subprocess, sys
from time import gmtime, strftime, time from time import gmtime, strftime, time
from erp5.util import taskdistribution from erp5.util import taskdistribution
from erp5.util.testsuite import SubprocessError, TestSuite from erp5.util.testsuite import SubprocessError, TestSuite
from pkg_resources import get_distribution
from zc.buildout.buildout import Buildout from zc.buildout.buildout import Buildout
if str is bytes: if str is bytes:
...@@ -99,29 +100,30 @@ def main(): ...@@ -99,29 +100,30 @@ def main():
[buildout] [buildout]
extends = %s extends = %s
develop =%s develop =%s
parts = test parts = testrunner
newest = false newest = false
[versions] [versions]
%s %s
[bootstrap] [testrunner]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = zc.buildout eggs =
${:recipe}
[test] zope.testing
recipe = zc.recipe.egg
eggs +=
zope.testrunner zope.testrunner
scripts = scripts =
zope-testrunner zope-testrunner
extra-paths =
%s
""" % (os.path.join(slapos_buildout, 'buildout.cfg'), """ % (os.path.join(slapos_buildout, 'buildout.cfg'),
''.join('\n ' + x for x in test_dict.values()), ''.join('\n ' + x for x in test_dict.values()),
'\n'.join(x + ' =' for x in test_dict)))) '\n'.join(x + ' =' for x in test_dict),
get_distribution('manuel').location,
)))
finally: finally:
os.close(fd) os.close(fd)
Buildout('buildout.cfg', {}).install(['bootstrap']) Buildout('buildout.cfg', {}).install(None)
subprocess.check_call((os.path.join('bin', 'buildout'),))
test_suite = BuildoutTestSuite(1) test_suite = BuildoutTestSuite(1)
while 1: while 1:
......
[buildout] [buildout]
extends = extends =
../../component/python-manuel/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
parts = parts =
slapos-cookbook slapos-cookbook
...@@ -14,6 +15,7 @@ git-executable = ${git:location}/bin/git ...@@ -14,6 +15,7 @@ git-executable = ${git:location}/bin/git
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = erp5.util eggs = erp5.util
zc.buildout zc.buildout
${manuel:egg}
scripts = ${:interpreter} scripts = ${:interpreter}
interpreter = ${:_buildout_section_name_} interpreter = ${:_buildout_section_name_}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment