Commit e5cd611c authored by Jérome Perrin's avatar Jérome Perrin

software/slapos-testing: stop testing slapos.toolbox on python2

This only support python3 since some time
parent 4230cd1b
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = a8bd56d112344ae56138e3a775fec478 md5sum = 5f5378550470b551d280dd432878a0ba
...@@ -177,19 +177,20 @@ inline = ...@@ -177,19 +177,20 @@ inline =
cwd="""$${slapos.recipe.template:location}""", cwd="""$${slapos.recipe.template:location}""",
summaryf=UnitTest.summary, summaryf=UnitTest.summary,
) )
TestCase( if six.PY3:
"slapos.toolbox", TestCase(
# ['python', '-m', 'unittest', 'discover', '-v'], "slapos.toolbox",
# XXX We can not just run unittest discover here, since slapos/lamp # ['python', '-m', 'unittest', 'discover', '-v'],
# imports MySQLDb and we currently don't have installed # XXX We can not just run unittest discover here, since slapos/lamp
# slapos.toolbox[lampconfigure] and on python3 discovery make a # imports MySQLDb and we currently don't have installed
# failing test for this import error. # slapos.toolbox[lampconfigure] and on python3 discovery make a
# Currently slapos/lamp is not tested, but if it it is still used, # failing test for this import error.
# the TODO seem to also install slapos.toolbox[lampconfigure] here. # Currently slapos/lamp is not tested, but if it it is still used,
['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'], # the TODO seem to also install slapos.toolbox[lampconfigure] here.
cwd="""$${slapos.toolbox:location}""", ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
summaryf=UnitTest.summary, cwd="""$${slapos.toolbox:location}""",
) summaryf=UnitTest.summary,
)
TestCase( TestCase(
"slapos.libnetworkcache", "slapos.libnetworkcache",
['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'], ['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'],
......
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