slaprunner/test: use slapos.testing

software/slaprunner/test/setup.py

@@ -25,12 +25,11 @@
 #
 #
 ##############################################################################
 ##############################################################################
 from setuptools import setup, find_packages
 from setuptools import setup, find_packages
-import glob
-import os
 
 
 version = '0.0.1.dev0'
 version = '0.0.1.dev0'
 name = 'slapos.test.slaprunner'
 name = 'slapos.test.slaprunner'
-long_description = open("README.md").read()
+with open("README.md") as f:
+  long_description = f.read()
 
 
 setup(name=name,
 setup(name=name,
       version=version,
       version=version,

software/slaprunner/test/test.py

@@ -26,35 +26,21 @@
 ##############################################################################
 ##############################################################################
 
 
 import os
 import os
-import shutil
-import urlparse
-import tempfile
-import requests
-import socket
-import StringIO
-import subprocess
-import json
 
 
-import psutil
-
-import utils
 from slapos.recipe.librecipe import generateHashFromFiles
 from slapos.recipe.librecipe import generateHashFromFiles
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 
-# for development: debugging logs and install Ctrl+C handler
-if os.environ.get('SLAPOS_TEST_DEBUG'):
-  import logging
-  logging.basicConfig(level=logging.DEBUG)
-  import unittest
-  unittest.installHandler()
+setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
 
 
 
 
-class InstanceTestCase(utils.SlapOSInstanceTestCase):
-  @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg')), )
+class SlaprunnerTestCase(SlapOSInstanceTestCase):
+  # Slaprunner uses unix sockets, so it needs short paths.
+  __partition_reference__ = 's'
 
 
-class ServicesTestCase(InstanceTestCase):
 
 
+class ServicesTestCase(SlaprunnerTestCase):
   def test_hashes(self):
   def test_hashes(self):
     hash_files = [
     hash_files = [
       'software_release/buildout.cfg',
       'software_release/buildout.cfg',
@@ -71,9 +57,10 @@ class ServicesTestCase(InstanceTestCase):
       'supervisord-{hash}-on-watch',
       'supervisord-{hash}-on-watch',
     ]
     ]
 
 
-    supervisor = self.getSupervisorRPCServer().supervisor
-    process_names = [process['name']
-                     for process in supervisor.getAllProcessInfo()]
+    with self.slap.instance_supervisor_rpc as supervisor:
+      process_names = [
+          process['name'] for process in supervisor.getAllProcessInfo()
+      ]
 
 
     hash_files = [os.path.join(self.computer_partition_root_path, path)
     hash_files = [os.path.join(self.computer_partition_root_path, path)
                   for path in hash_files]
                   for path in hash_files]