Skip to content

slapos
slapos
Commit eeb45835 authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

py3

parent be75d825
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 101 deletions
software/slapos-testing/buildout.hash.cfg
View file @ eeb45835
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 5f5378550470b551d280dd432878a0ba md5sum = eaf037ce345f0f5512eda1fc6039a9e0
software/slapos-testing/instance.cfg
View file @ eeb45835
...@@ -120,102 +120,101 @@ output = $${:workdir}/.nxdtest ...@@ -120,102 +120,101 @@ output = $${:workdir}/.nxdtest
workdir = $${create-directory:nxdtest-working-dir} workdir = $${create-directory:nxdtest-working-dir}
inline = inline =
import six import six
TestCase( #TestCase(
"kedifa", # "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'], # ['python', '-m', 'unittest', 'discover', '-v'],
# XXX some test fail when running with unittest (slapos*.cfg.example # cwd="""$${kedifa:location}""",
# files cannot be found with pkg_resources.resource_string), so we keep # summaryf=UnitTest.summary,
# using setup.py test for now. #)
['python', 'setup.py', 'test'], #TestCase(
cwd="""$${slapos.core:location}""", # "caucase",
summaryf=UnitTest.summary, # ['$${caucase-test-runner:output}'],
) # cwd="""$${caucase:location}""",
TestCase( # summaryf=UnitTest.summary,
"slapos.recipe.build", #)
['python', '-m', 'unittest', 'discover', '-v'], #TestCase(
cwd="""$${slapos.recipe.build:location}""", # "erp5.util",
summaryf=UnitTest.summary, # ['python', '-m', 'unittest', 'discover', '-v', '--start', 'erp5/tests/'],
) # cwd="""$${erp5.util:location}""",
TestCase( # summaryf=UnitTest.summary,
"slapos.recipe.cmmi", #)
['python', '-m', 'unittest', 'discover', '-v'], #TestCase(
cwd="""$${slapos.recipe.cmmi:location}""", # "slapos.cookbook",
summaryf=UnitTest.summary, # # slapos/test contain both tests for recipes and tests for
) # # json schemas, we only care about recipe tests here, json
TestCase( # # schemas are tested in software/slapos-sr-testing
"slapos.recipe.template", # ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test/recipe'],
# ['python', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'], # cwd="""$${slapos.cookbook:location}""",
# XXX some test fail when running with unittest, so we keep using setup.py test # summaryf=UnitTest.summary,
['python', 'setup.py', 'test'], #)
cwd="""$${slapos.recipe.template:location}""", #TestCase(
summaryf=UnitTest.summary, # "slapos.core",
) # # ['python', '-m', 'unittest', 'discover', '-v'],
if six.PY3: # # XXX some test fail when running with unittest (slapos*.cfg.example
TestCase( # # files cannot be found with pkg_resources.resource_string), so we keep
"slapos.toolbox", # # 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'], # ['python', '-m', 'unittest', 'discover', '-v'],
# XXX We can not just run unittest discover here, since slapos/lamp # cwd="""$${slapos.recipe.build:location}""",
# imports MySQLDb and we currently don't have installed # summaryf=UnitTest.summary,
# slapos.toolbox[lampconfigure] and on python3 discovery make a #)
# failing test for this import error. #TestCase(
# Currently slapos/lamp is not tested, but if it it is still used, # "slapos.recipe.cmmi",
# the TODO seem to also install slapos.toolbox[lampconfigure] here. # ['python', '-m', 'unittest', 'discover', '-v'],
['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'], # cwd="""$${slapos.recipe.cmmi:location}""",
cwd="""$${slapos.toolbox:location}""", # summaryf=UnitTest.summary,
summaryf=UnitTest.summary, #)
) #TestCase(
TestCase( # "slapos.recipe.template",
"slapos.libnetworkcache", # # ['python', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'],
['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'], # # XXX some test fail when running with unittest, so we keep using setup.py test
cwd="""$${slapos.libnetworkcache:location}""", # ['python', 'setup.py', 'test'],
summaryf=UnitTest.summary, # cwd="""$${slapos.recipe.template:location}""",
) # summaryf=UnitTest.summary,
TestCase( #)
"slapcache", #if six.PY3:
['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapcache/test'], # TestCase(
cwd="""$${slapcache:location}""", # "slapos.toolbox",
summaryf=UnitTest.summary, # # ['python', '-m', 'unittest', 'discover', '-v'],
) # # XXX We can not just run unittest discover here, since slapos/lamp
TestCase( # # imports MySQLDb and we currently don't have installed
"slapos.rebootstrap", # # slapos.toolbox[lampconfigure] and on python3 discovery make a
['python', '-m', 'unittest', '-v', 'slapos.rebootstrap.tests.test_suite'], # # failing test for this import error.
cwd="""$${slapos.rebootstrap:location}""", # # Currently slapos/lamp is not tested, but if it it is still used,
summaryf=UnitTest.summary, # # the TODO seem to also install slapos.toolbox[lampconfigure] here.
) # ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
TestCase( # cwd="""$${slapos.toolbox:location}""",
"rubygemsrecipe", # summaryf=UnitTest.summary,
['python', '-m', 'unittest', 'discover', '-v'], # )
cwd="""$${rubygemsrecipe:location}""", #TestCase(
summaryf=UnitTest.summary, # "slapos.libnetworkcache",
) # ['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'],
if six.PY2: # 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( TestCase(
"re6stnet", "re6stnet",
['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'], ['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],
......
software/slapos-testing/software.cfg
View file @ eeb45835
...@@ -138,6 +138,7 @@ eggs = ...@@ -138,6 +138,7 @@ eggs =
[eggs] [eggs]
<= python-interpreter <= python-interpreter
eggs += eggs +=
${extra-eggs:eggs}
${lxml-python:egg} ${lxml-python:egg}
${python-PyYAML:egg} ${python-PyYAML:egg}
${python-cryptography:egg} ${python-cryptography:egg}
...@@ -155,12 +156,13 @@ eggs += ...@@ -155,12 +156,13 @@ eggs +=
${slapos.libnetworkcache-setup:egg} ${slapos.libnetworkcache-setup:egg}
${slapcache-setup:egg} ${slapcache-setup:egg}
${slapos.rebootstrap-setup:egg} ${slapos.rebootstrap-setup:egg}
${re6stnet-setup:egg}
${rubygemsrecipe-setup:egg} ${rubygemsrecipe-setup:egg}
${pandas:egg} ${pandas:egg}
${statsmodels:egg} ${statsmodels:egg}
${scipy:egg} ${scipy:egg}
zope.testing zope.testing
${extra-eggs:eggs} supervisor
[eggs/scripts] [eggs/scripts]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -239,6 +241,7 @@ repository = https://lab.nexedi.com/nexedi/rubygemsrecipe.git ...@@ -239,6 +241,7 @@ repository = https://lab.nexedi.com/nexedi/rubygemsrecipe.git
[re6stnet-repository] [re6stnet-repository]
<= git-clone-repository <= git-clone-repository
repository = https://lab.nexedi.com/nexedi/re6stnet.git repository = https://lab.nexedi.com/nexedi/re6stnet.git
branch = re6st-py3
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7