slaprunner new style test

software/slaprunner/test/test.py

@@ -38,22 +38,32 @@ import json
 import psutil
 
 from slapos.testing.testcase import SlapOSInstanceTestCase
+from slapos.testing.testcase import installSoftwareUrlList
 
 #import ipdb; ipdb.set_trace()
 
+SLAPOS_TEST_DEBUG = os.environ.get('SLAPOS_TEST_DEBUG')
+SLAPOS_TEST_SOFTWARE_URL = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg')),
+
 # for development: debugging logs and install Ctrl+C handler
-if os.environ.get('DEBUG'):
+if SLAPOS_TEST_DEBUG:
   import logging
   logging.basicConfig(level=logging.DEBUG)
   import unittest
   unittest.installHandler()
 
 
+def setUpModule():
+  installSoftwareUrlList(
+    [SLAPOS_TEST_SOFTWARE_URL],
+    debug=SLAPOS_TEST_DEBUG
+  )
+
 class InstanceTestCase(SlapOSInstanceTestCase):
+  debug = SLAPOS_TEST_DEBUG
   @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg')), )
-
+  def getSoftwareURL(cls):
+    return SLAPOS_TEST_SOFTWARE_URL
 
 class ServicesTestCase(InstanceTestCase):
   @staticmethod