Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
slapos-mynij-dev
Commits
040a3ce8
Commit
040a3ce8
authored
May 22, 2020
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
buildout-testing: update manuel to fix test detection in Python 2
parent
7a325c69
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
10 deletions
+26
-10
component/python-manuel/buildout.cfg
component/python-manuel/buildout.cfg
+12
-0
software/buildout-testing/runTestSuite.in
software/buildout-testing/runTestSuite.in
+12
-10
software/buildout-testing/software.cfg
software/buildout-testing/software.cfg
+2
-0
No files found.
component/python-manuel/buildout.cfg
0 → 100644
View file @
040a3ce8
[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
software/buildout-testing/runTestSuite.in
View file @
040a3ce8
...
...
@@ -4,6 +4,7 @@ import argparse, os, re, subprocess, sys
from time import gmtime, strftime, time
from erp5.util import taskdistribution
from erp5.util.testsuite import SubprocessError, TestSuite
from pkg_resources import get_distribution
from zc.buildout.buildout import Buildout
if str is bytes:
...
...
@@ -99,29 +100,30 @@ def main():
[buildout]
extends = %s
develop =%s
parts = test
parts = test
runner
newest = false
[versions]
%s
[
bootstrap
]
[
testrunner
]
recipe = zc.recipe.egg
eggs = zc.buildout
[test]
recipe = zc.recipe.egg
eggs +=
eggs =
${:recipe}
zope.testing
zope.testrunner
scripts =
zope-testrunner
extra-paths =
%s
""" % (os.path.join(slapos_buildout, 'buildout.cfg'),
''.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:
os.close(fd)
Buildout('buildout.cfg', {}).install(['bootstrap'])
subprocess.check_call((os.path.join('bin', 'buildout'),))
Buildout('buildout.cfg', {}).install(None)
test_suite = BuildoutTestSuite(1)
while 1:
...
...
software/buildout-testing/software.cfg
View file @
040a3ce8
[buildout]
extends =
../../component/python-manuel/buildout.cfg
../../stack/slapos.cfg
parts =
slapos-cookbook
...
...
@@ -14,6 +15,7 @@ git-executable = ${git:location}/bin/git
recipe = zc.recipe.egg
eggs = erp5.util
zc.buildout
${manuel:egg}
scripts = ${:interpreter}
interpreter = ${:_buildout_section_name_}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment