wip

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 2a82b7d5163d042e85b14a645707a093
+md5sum = 7ff4fcd5279daa81f64a7ab34e837ced

software/slapos-testing/instance.cfg

@@ -90,96 +90,16 @@ rendered = $${:workdir}/.nxdtest
 workdir = $${create-directory:nxdtest-working-dir}
 
 template = inline:
-  TestCase(
-      "kedifa",
-      ['python', '-m', 'unittest', 'discover', '-v'],
-      cwd="""$${kedifa:location}""",
-      summaryf=UnitTest.summary,
-  )
-  TestCase(
-      "caucase",
-      # XXX caucase uses 2to3 dynamically in setup.py, so it only supports
-      # runnning tests with python setup.py test
-      ['python', 'setup.py', 'test'],
-      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'],
+      ['python', 'setup.py', 'test', '-s', 'slapos.tests.test_slapgrid.TestSlapgridCPPartitionProcessing.test_processing_summary'],
       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,
-  )
-  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(
-      "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,
-  )
 
 [runTestSuite]
 env.sh = $${slapos-test-runner-nxdtest-environment.sh:rendered}