Commit 9de31226 authored by Joanne Hugé's avatar Joanne Hugé

Modify instance.cfg instead of software.cfg

parent af6d5d6b
......@@ -15,4 +15,4 @@
[template]
filename = instance.cfg
md5sum = 5f5378550470b551d280dd432878a0ba
md5sum = 37be412d7b56b49f2ad1ff973b0c32c1
......@@ -120,101 +120,101 @@ output = $${:workdir}/.nxdtest
workdir = $${create-directory:nxdtest-working-dir}
inline =
import six
TestCase(
"kedifa",
['python', '-m', 'unittest', 'discover', '-v'],
cwd="""$${kedifa:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"caucase",
['$${caucase-test-runner:output}'],
cwd="""$${caucase:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"erp5.util",
['python', '-m', 'unittest', 'discover', '-v', '--start', 'erp5/tests/'],
cwd="""$${erp5.util:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"slapos.cookbook",
# slapos/test contain both tests for recipes and tests for
# json schemas, we only care about recipe tests here, json
# schemas are tested in software/slapos-sr-testing
['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test/recipe'],
cwd="""$${slapos.cookbook:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"slapos.core",
# ['python', '-m', 'unittest', 'discover', '-v'],
# XXX some test fail when running with unittest (slapos*.cfg.example
# files cannot be found with pkg_resources.resource_string), so we keep
# using setup.py test for now.
['python', 'setup.py', 'test'],
cwd="""$${slapos.core:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"slapos.recipe.build",
['python', '-m', 'unittest', 'discover', '-v'],
cwd="""$${slapos.recipe.build:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"slapos.recipe.cmmi",
['python', '-m', 'unittest', 'discover', '-v'],
cwd="""$${slapos.recipe.cmmi:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"slapos.recipe.template",
# ['python', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'],
# XXX some test fail when running with unittest, so we keep using setup.py test
['python', 'setup.py', 'test'],
cwd="""$${slapos.recipe.template:location}""",
summaryf=UnitTest.summary,
)
if six.PY3:
TestCase(
"slapos.toolbox",
# ['python', '-m', 'unittest', 'discover', '-v'],
# XXX We can not just run unittest discover here, since slapos/lamp
# imports MySQLDb and we currently don't have installed
# slapos.toolbox[lampconfigure] and on python3 discovery make a
# failing test for this import error.
# Currently slapos/lamp is not tested, but if it it is still used,
# the TODO seem to also install slapos.toolbox[lampconfigure] here.
['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
cwd="""$${slapos.toolbox:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"slapos.libnetworkcache",
['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'],
cwd="""$${slapos.libnetworkcache:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"slapcache",
['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapcache/test'],
cwd="""$${slapcache:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"slapos.rebootstrap",
['python', '-m', 'unittest', '-v', 'slapos.rebootstrap.tests.test_suite'],
cwd="""$${slapos.rebootstrap:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"rubygemsrecipe",
['python', '-m', 'unittest', 'discover', '-v'],
cwd="""$${rubygemsrecipe:location}""",
summaryf=UnitTest.summary,
)
#TestCase(
# "kedifa",
# ['python', '-m', 'unittest', 'discover', '-v'],
# cwd="""$${kedifa:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "caucase",
# ['$${caucase-test-runner:output}'],
# cwd="""$${caucase:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "erp5.util",
# ['python', '-m', 'unittest', 'discover', '-v', '--start', 'erp5/tests/'],
# cwd="""$${erp5.util:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "slapos.cookbook",
# # slapos/test contain both tests for recipes and tests for
# # json schemas, we only care about recipe tests here, json
# # schemas are tested in software/slapos-sr-testing
# ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test/recipe'],
# cwd="""$${slapos.cookbook:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "slapos.core",
# # ['python', '-m', 'unittest', 'discover', '-v'],
# # XXX some test fail when running with unittest (slapos*.cfg.example
# # files cannot be found with pkg_resources.resource_string), so we keep
# # using setup.py test for now.
# ['python', 'setup.py', 'test'],
# cwd="""$${slapos.core:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "slapos.recipe.build",
# ['python', '-m', 'unittest', 'discover', '-v'],
# cwd="""$${slapos.recipe.build:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "slapos.recipe.cmmi",
# ['python', '-m', 'unittest', 'discover', '-v'],
# cwd="""$${slapos.recipe.cmmi:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "slapos.recipe.template",
# # ['python', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'],
# # XXX some test fail when running with unittest, so we keep using setup.py test
# ['python', 'setup.py', 'test'],
# cwd="""$${slapos.recipe.template:location}""",
# summaryf=UnitTest.summary,
#)
#if six.PY3:
# TestCase(
# "slapos.toolbox",
# # ['python', '-m', 'unittest', 'discover', '-v'],
# # XXX We can not just run unittest discover here, since slapos/lamp
# # imports MySQLDb and we currently don't have installed
# # slapos.toolbox[lampconfigure] and on python3 discovery make a
# # failing test for this import error.
# # Currently slapos/lamp is not tested, but if it it is still used,
# # the TODO seem to also install slapos.toolbox[lampconfigure] here.
# ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
# cwd="""$${slapos.toolbox:location}""",
# summaryf=UnitTest.summary,
# )
#TestCase(
# "slapos.libnetworkcache",
# ['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'],
# cwd="""$${slapos.libnetworkcache:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "slapcache",
# ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapcache/test'],
# cwd="""$${slapcache:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "slapos.rebootstrap",
# ['python', '-m', 'unittest', '-v', 'slapos.rebootstrap.tests.test_suite'],
# cwd="""$${slapos.rebootstrap:location}""",
# summaryf=UnitTest.summary,
#)
#TestCase(
# "rubygemsrecipe",
# ['python', '-m', 'unittest', 'discover', '-v'],
# cwd="""$${rubygemsrecipe:location}""",
# summaryf=UnitTest.summary,
#)
if six.PY2:
TestCase(
"re6stnet",
......
......@@ -140,32 +140,32 @@ eggs =
<= python-interpreter
eggs +=
${extra-eggs:eggs}
# ${lxml-python:egg}
# ${python-PyYAML:egg}
# ${python-cryptography:egg}
# ${backports.lzma:egg}
# ${pycurl:egg}
# ${bcrypt:egg}
# dnspython
# Jinja2
# ${kedifa-setup:egg}
# ${caucase-setup:egg}
# ${erp5.util-setup:egg}
# ${slapos.cookbook-setup:egg}
# ${slapos.core-setup:egg}
# ${slapos.recipe.build-setup:egg}
# ${slapos.recipe.cmmi-setup:egg}
# ${slapos.recipe.template-setup:egg}
# ${slapos.toolbox-setup:egg}
# ${slapos.libnetworkcache-setup:egg}
# ${slapcache-setup:egg}
# ${slapos.rebootstrap-setup:egg}
# ${rubygemsrecipe-setup:egg}
# ${pandas:egg}
# ${statsmodels:egg}
# ${scipy:egg}
# zope.testing
# supervisor
${lxml-python:egg}
${python-PyYAML:egg}
${python-cryptography:egg}
${backports.lzma:egg}
${pycurl:egg}
${bcrypt:egg}
dnspython
Jinja2
${kedifa-setup:egg}
${caucase-setup:egg}
${erp5.util-setup:egg}
${slapos.cookbook-setup:egg}
${slapos.core-setup:egg}
${slapos.recipe.build-setup:egg}
${slapos.recipe.cmmi-setup:egg}
${slapos.recipe.template-setup:egg}
${slapos.toolbox-setup:egg}
${slapos.libnetworkcache-setup:egg}
${slapcache-setup:egg}
${slapos.rebootstrap-setup:egg}
${rubygemsrecipe-setup:egg}
${pandas:egg}
${statsmodels:egg}
${scipy:egg}
zope.testing
supervisor
[eggs/scripts]
recipe = zc.recipe.egg
......
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