Update most SR tests to use slapos.testing

Update almost all tests to use slapos.core!64 

Notable changes:
 * the testcase class is generated dynamically with `makeModuleSetUpAndTestCaseClass`
 * `self.slap` allow low level control of slapos
 * IP addresses are available as `_ipv6_address` and `_ipv4_address` class attributes
 * `getSupervisorRPCServer` no longer exist, instead use `self.slap.instance_supervisor_rpc` (as context manager)
 * now the framework takes care of running promises and instance step fail when instanciation fail or when promises are not satisfied (as a result, some tests checking promises are dropped)
 * test needs `slapos` and `supervisord` commands in PATH. It's important to have a recent enough `slapos` and not the `~/bin/slapos` from slaprunner which sets `$SLAPOS_CONFIGURATION` 

Following tests were not updated:
 * `caddy-frontend` as this will require more work, because this software uses shared partitions and maybe other things will need to be adapted in the tests. 
 * `slapos-master` as it is same as ERP5 and I thought maybe we can do better than duplicating code, so I left it as is for now.
 * `nextcloud` as this fail the `slapos node instance` step.

There are also a few style changes or small fixes to make pylint happy and some other fixes for problems with softwares and also a fix for seleniumrunner flaky test.

/reviewed-on !624

software/erp5/test/setup.py

@@ -28,7 +28,8 @@ from setuptools import setup, find_packages
 
 version = '0.0.1.dev0'
 name = 'slapos.test.erp5'
-long_description = open("README.md").read()
+with open("README.md") as f:
+  long_description = f.read()
 
 setup(name=name,
       version=version,

software/erp5/test/test/__init__.py

@@ -25,15 +25,24 @@
 #
 ##############################################################################
 
+import json
 import os
-import unittest
-import logging
 
-if os.environ.get('DEBUG'):
-  raise ValueError("Don't set DEBUG - it breaks postfix compilation - set SLAPOS_TEST_DEBUG instead.")
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
-debug_mode = os.environ.get('SLAPOS_TEST_DEBUG')
-# for development: debugging logs and install Ctrl+C handler
-if debug_mode:
-  logging.basicConfig(level=logging.DEBUG)
-  unittest.installHandler()
+setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', '..', 'software.cfg')))
+
+
+class ERP5InstanceTestCase(SlapOSInstanceTestCase):
+  """ERP5 base test case
+  """
+  # ERP5 instanciation needs to run several times before being ready, as
+  # the root instance request more instances.
+  instance_max_retry = 7 # XXX how many times ?
+
+  def getRootPartitionConnectionParameterDict(self):
+    """Return the output paramters from the root partition"""
+    return json.loads(
+        self.computer_partition.getConnectionParameterDict()['_'])

software/erp5/test/test/test_erp5.py

@@ -29,28 +29,15 @@ import os
 import json
 import glob
 import urlparse
-import logging
 import socket
 import time
 
 import psutil
 import requests
 
-from utils import SlapOSInstanceTestCase
-
-
-class ERP5TestCase(SlapOSInstanceTestCase):
-  """Test the remote driver on a minimal web server.
-  """
-  logger = logging.getLogger(__name__)
-  @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'software.cfg')), )
-
-  def getRootPartitionConnectionParameterDict(self):
-    """Return the output paramters from the root partition"""
-    return json.loads(
-        self.computer_partition.getConnectionParameterDict()['_'])
+from . import ERP5InstanceTestCase
+from . import setUpModule
+setUpModule # pyflakes
 
 
 class TestPublishedURLIsReachableMixin(object):
@@ -60,12 +47,14 @@ class TestPublishedURLIsReachableMixin(object):
     # What happens is that instanciation just create the services, but does not
     # wait for ERP5 to be initialized. When this test run ERP5 instance is
     # instanciated, but zope is still busy creating the site and haproxy replies
-    # with 503 Service Unavailable.
+    # with 503 Service Unavailable, sometimes the first request is 404, so we
+    # retry in a loop.
     # If we can move the "create site" in slapos node instance, then this retry loop
     # would not be necessary.
-    for i in range(1, 20):
+    for i in range(1, 60):
       r = requests.get(url, verify=False)  # XXX can we get CA from caucase already ?
-      if r.status_code == requests.codes.service_unavailable:
+      if r.status_code in (requests.codes.service_unavailable,
+                           requests.codes.not_found):
         delay = i * 2
         self.logger.warn("ERP5 was not available, sleeping for %ds and retrying", delay)
         time.sleep(delay)
@@ -91,13 +80,13 @@ class TestPublishedURLIsReachableMixin(object):
       urlparse.urljoin(param_dict['family-default'], param_dict['site-id']))
 
 
-class TestDefaultParameters(ERP5TestCase, TestPublishedURLIsReachableMixin):
+class TestDefaultParameters(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
   """Test ERP5 can be instanciated with no parameters
   """
   __partition_reference__ = 'defp'
 
 
-class TestMedusa(ERP5TestCase, TestPublishedURLIsReachableMixin):
+class TestMedusa(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
   """Test ERP5 Medusa server
   """
   __partition_reference__ = 'medusa'
@@ -107,7 +96,7 @@ class TestMedusa(ERP5TestCase, TestPublishedURLIsReachableMixin):
     return {'_': json.dumps({'wsgi': False})}
 
 
-class TestApacheBalancerPorts(ERP5TestCase):
+class TestApacheBalancerPorts(ERP5InstanceTestCase):
   """Instanciate with two zope families, this should create for each family:
    - a balancer entry point with corresponding haproxy
    - a balancer entry point for test runner
@@ -159,8 +148,8 @@ class TestApacheBalancerPorts(ERP5TestCase):
 
   def test_zope_listen(self):
     # we requested 3 zope in family1 and 5 zopes in family2, we should have 8 zope running.
-    all_process_info = self.getSupervisorRPCServer(
-    ).supervisor.getAllProcessInfo()
+    with self.slap.instance_supervisor_rpc as supervisor:
+      all_process_info = supervisor.getAllProcessInfo()
     self.assertEqual(
         3 + 5,
         len([p for p in all_process_info if p['name'].startswith('zope-')]))
@@ -168,8 +157,8 @@ class TestApacheBalancerPorts(ERP5TestCase):
   def test_apache_listen(self):
     # We have 2 families, apache should listen to a total of 3 ports per family
     # normal access on ipv4 and ipv6 and test runner access on ipv4 only
-    all_process_info = self.getSupervisorRPCServer(
-    ).supervisor.getAllProcessInfo()
+    with self.slap.instance_supervisor_rpc as supervisor:
+      all_process_info = supervisor.getAllProcessInfo()
     process_info, = [p for p in all_process_info if p['name'] == 'apache']
     apache_process = psutil.Process(process_info['pid'])
     self.assertEqual(
@@ -182,8 +171,8 @@ class TestApacheBalancerPorts(ERP5TestCase):
 
   def test_haproxy_listen(self):
     # There is one haproxy per family
-    all_process_info = self.getSupervisorRPCServer(
-    ).supervisor.getAllProcessInfo()
+    with self.slap.instance_supervisor_rpc as supervisor:
+      all_process_info = supervisor.getAllProcessInfo()
     process_info, = [
         p for p in all_process_info if p['name'].startswith('haproxy-')
     ]
@@ -193,7 +182,7 @@ class TestApacheBalancerPorts(ERP5TestCase):
     ])
 
 
-class TestDisableTestRunner(ERP5TestCase, TestPublishedURLIsReachableMixin):
+class TestDisableTestRunner(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
   """Test ERP5 can be instanciated without test runner.
   """
   __partition_reference__ = 'distr'
@@ -215,8 +204,8 @@ class TestDisableTestRunner(ERP5TestCase, TestPublishedURLIsReachableMixin):
 
   def test_no_apache_testrunner_port(self):
     # Apache only listen on two ports, there is no apache ports allocated for test runner
-    all_process_info = self.getSupervisorRPCServer(
-    ).supervisor.getAllProcessInfo()
+    with self.slap.instance_supervisor_rpc as supervisor:
+      all_process_info = supervisor.getAllProcessInfo()
     process_info, = [p for p in all_process_info if p['name'] == 'apache']
     apache_process = psutil.Process(process_info['pid'])
     self.assertEqual(

software/helloworld/test/setup.py

@@ -28,9 +28,11 @@ from setuptools import setup, find_packages
 
 version = '0.0.1.dev0'
 name = 'slapos.test.helloworld'
-long_description = open("README.md").read()
+with open("README.md") as f:
+  long_description = f.read()
 
-setup(name=name,
+setup(
+    name=name,
     version=version,
     description="Test for SlapOS' helloworld",
     long_description=long_description,
@@ -47,4 +49,4 @@ setup(name=name,
     ],
     zip_safe=True,
     test_suite='test',
-    )
+)

software/helloworld/test/test.py

@@ -27,26 +27,19 @@
 
 import os
 import requests
-import utils
 
-# 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()
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
+setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
 
-class HelloWorldTestCase(utils.SlapOSInstanceTestCase):
+
+class HelloWorldTestCase(SlapOSInstanceTestCase):
   # to be defined by subclasses
   name = None
   kind = None
 
-  @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')),)
-
   @classmethod
   def getInstanceParameterDict(cls):
     return {"name": cls.name}

software/jupyter/test/test.py

@@ -25,26 +25,20 @@
 #
 ##############################################################################
 
-import utils
 
 import httplib
 import json
 import os
 import requests
 
-# 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()
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
+setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
 
-class TestJupyter(utils.SlapOSInstanceTestCase):
-  @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')),)
+
+class TestJupyter(InstanceTestCase):
 
   def test(self):
     parameter_dict = self.computer_partition.getConnectionParameterDict()
@@ -54,12 +48,11 @@ class TestJupyter(utils.SlapOSInstanceTestCase):
     except Exception as e:
       self.fail("Can't parse json in %s, error %s" % (parameter_dict['_'], e))
 
-    ip = os.environ['SLAPOS_TEST_IPV6']
     self.assertEqual(
       {
-        'jupyter-classic-url': 'https://[%s]:8888/tree' % (ip,),
-        'jupyterlab-url': 'https://[%s]:8888/lab' % (ip,),
-        'url': 'https://[%s]:8888/tree' % (ip,)
+        'jupyter-classic-url': 'https://[%s]:8888/tree' % (self._ipv6_address, ),
+        'jupyterlab-url': 'https://[%s]:8888/lab' % (self._ipv6_address, ),
+        'url': 'https://[%s]:8888/tree' % (self._ipv6_address, )
       },
       connection_dict
     )

software/kvm/test/setup.py

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

software/kvm/test/test.py

@@ -26,30 +26,15 @@
 ##############################################################################
 
 import os
-import shutil
-import urlparse
-import tempfile
-import requests
-import socket
-import StringIO
-import subprocess
-import json
 
-import utils
 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, InstanceTestCase = 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 ServicesTestCase(InstanceTestCase):
 
@@ -67,7 +52,7 @@ class ServicesTestCase(InstanceTestCase):
       'websockify-{hash}-on-watch',
     ]
 
-    supervisor = self.getSupervisorRPCServer().supervisor
+    with self.slap.instance_supervisor_rpc as supervisor:
       process_names = [process['name']
                      for process in supervisor.getAllProcessInfo()]
 

software/monitor/test/setup.py

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

software/monitor/test/test.py

@@ -26,33 +26,17 @@
 ##############################################################################
 
 import os
-import shutil
-import urlparse
-import tempfile
-import requests
-import socket
-import StringIO
-import subprocess
-import json
 
-import utils
 from slapos.recipe.librecipe import generateHashFromFiles
 
-# 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()
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
+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 ServicesTestCase(InstanceTestCase):
+class ServicesTestCase(SlapOSInstanceTestCase):
 
   def test_hashes(self):
     hash_files = [
@@ -63,7 +47,7 @@ class ServicesTestCase(InstanceTestCase):
       'crond-{hash}-on-watch',
     ]
 
-    supervisor = self.getSupervisorRPCServer().supervisor
+    with self.slap.instance_supervisor_rpc as supervisor:
       process_names = [process['name']
                        for process in supervisor.getAllProcessInfo()]
 

software/plantuml/test/setup.py

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

software/plantuml/test/test.py

@@ -35,21 +35,13 @@ from PIL import Image
 import requests
 import plantuml
 
-import utils
 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()
 
-
-class PlantUMLTestCase(utils.SlapOSInstanceTestCase):
-  @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg')), )
+setUpModule, PlantUMLTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
 
 
 class TestSimpleDiagram(PlantUMLTestCase):
@@ -165,7 +157,7 @@ class ServicesTestCase(PlantUMLTestCase):
       'tomcat-instance-{hash}-on-watch',
     ]
 
-    supervisor = self.getSupervisorRPCServer().supervisor
+    with self.slap.instance_supervisor_rpc as supervisor:
       process_names = [process['name']
                      for process in supervisor.getAllProcessInfo()]
 

software/powerdns/instance-powerdns.cfg

@@ -120,7 +120,7 @@ monitor-password = $${monitor-publish-parameters:monitor-password}
 #####################
 # Power DNS Slave configuration
 #
-{% set slave_instance_list = json_module.loads(slapparameter_dict.get('extra_slave_instance_list', '')) %}
+{% set slave_instance_list = json_module.loads(slapparameter_dict.get('extra_slave_instance_list', '[]')) %}
 
 # Iter through slave list to prepare configuration
 {% for slave in slave_instance_list %}

software/powerdns/software.cfg

@@ -25,7 +25,7 @@ mode = 0644
 [template-powerdns]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-powerdns.cfg
-md5sum = 5077ba344b641fa9703f9872a974d3d7
+md5sum = f0d87be6df84f23c811638ce9d5f60ea
 output = ${buildout:directory}/template-powerdns.cfg
 mode = 0644
 

software/powerdns/test/setup.py

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

software/powerdns/test/test.py

@@ -26,33 +26,22 @@
 ##############################################################################
 
 import os
-import shutil
-import urlparse
-import tempfile
-import requests
-import socket
-import StringIO
-import subprocess
-import json
 
-import utils
 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 PowerDNSTestCase(SlapOSInstanceTestCase):
+  # power dns uses sockets and need shorter paths on test nodes.
+  __partition_reference__ = 'pdns'
 
-class ServicesTestCase(InstanceTestCase):
+
+class ServicesTestCase(PowerDNSTestCase):
 
   def test_hashes(self):
     hash_files = [
@@ -62,7 +51,7 @@ class ServicesTestCase(InstanceTestCase):
       'pdns-{hash}-on-watch',
     ]
 
-    supervisor = self.getSupervisorRPCServer().supervisor
+    with self.slap.instance_supervisor_rpc as supervisor:
       process_names = [process['name']
                        for process in supervisor.getAllProcessInfo()]
 

software/proftpd/test/setup.py

@@ -25,14 +25,14 @@
 #
 ##############################################################################
 from setuptools import setup, find_packages
-import glob
-import os
 
 version = '0.0.1.dev0'
 name = 'slapos.test.proftpd'
-long_description = open("README.md").read()
+with open("README.md") as f:
+  long_description = f.read()
 
-setup(name=name,
+setup(
+    name=name,
     version=version,
     description="Test for SlapOS' ProFTPd",
     long_description=long_description,
@@ -51,4 +51,4 @@ setup(name=name,
     ],
     zip_safe=True,
     test_suite='test',
-    )
+)

software/proftpd/test/test.py

@@ -37,22 +37,15 @@ import psutil
 from paramiko.ssh_exception import SSHException
 from paramiko.ssh_exception import AuthenticationException
 
-import utils
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+from slapos.testing.utils import findFreeTCPPort
 
+setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    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('SLAPOS_TEST_DEBUG'):
-  import logging
-  logging.basicConfig(level=logging.DEBUG)
-  import unittest
-  unittest.installHandler()
-
-
-class ProFTPdTestCase(utils.SlapOSInstanceTestCase):
-  @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg')), )
 
+class ProFTPdTestCase(SlapOSInstanceTestCase):
   def _getConnection(self, username=None, password=None, hostname=None):
     """Returns a pysftp connection connected to the SFTP
 
@@ -77,7 +70,7 @@ class ProFTPdTestCase(utils.SlapOSInstanceTestCase):
 
 class TestSFTPListen(ProFTPdTestCase):
   def test_listen_on_ipv4(self):
-    self.assertTrue(self._getConnection(hostname=self.config['ipv4_address']))
+    self.assertTrue(self._getConnection(hostname=self._ipv4_address))
 
   def test_does_not_listen_on_all_ip(self):
     with self.assertRaises(SSHException):
@@ -115,20 +108,22 @@ class TestSFTPOperations(ProFTPdTestCase):
 
       # download the file again, it should have same content
       tempdir = tempfile.mkdtemp()
-      self.addCleanup(lambda : shutil.rmtree(tempdir))
+      self.addCleanup(lambda: shutil.rmtree(tempdir))
       local_file = os.path.join(tempdir, 'testfile')
-      retrieve_same_file = sftp.get('testfile', local_file)
+      sftp.get('testfile', local_file)
       with open(local_file) as f:
         self.assertEqual(f.read(), "Hello FTP !")
 
   def test_uploaded_file_not_visible_until_fully_uploaded(self):
     test_self = self
+
     class PartialFile(StringIO.StringIO):
       def read(self, *args):
         # file is not visible yet
         test_self.assertNotIn('destination', os.listdir(test_self.upload_dir))
         # it's just a hidden file
-        test_self.assertEqual(['.in.destination.'], os.listdir(test_self.upload_dir))
+        test_self.assertEqual(
+            ['.in.destination.'], os.listdir(test_self.upload_dir))
         return StringIO.StringIO.read(self, *args)
 
     with self._getConnection() as sftp:
@@ -140,13 +135,16 @@ class TestSFTPOperations(ProFTPdTestCase):
   def test_partial_upload_are_deleted(self):
     test_self = self
     with self._getConnection() as sftp:
+
       class ErrorFile(StringIO.StringIO):
         def read(self, *args):
           # at this point, file is already created on server
-          test_self.assertEqual(['.in.destination.'], os.listdir(test_self.upload_dir))
+          test_self.assertEqual(
+              ['.in.destination.'], os.listdir(test_self.upload_dir))
           # simulate a connection closed
           sftp.sftp_client.close()
           return "something that will not be sent to server"
+
       with self.assertRaises(IOError):
         sftp.sftp_client.putfo(ErrorFile(), "destination")
     # no half uploaded file is kept
@@ -164,11 +162,13 @@ class TestSFTPOperations(ProFTPdTestCase):
 
 class TestUserManagement(ProFTPdTestCase):
   def test_user_can_be_added_from_script(self):
-    with self.assertRaisesRegexp(AuthenticationException, 'Authentication failed'):
+    with self.assertRaisesRegexp(AuthenticationException,
+                                 'Authentication failed'):
       self._getConnection(username='bob', password='secret')
 
     subprocess.check_call(
-      'echo secret | %s/bin/ftpasswd --name=bob --stdin' % self.computer_partition_root_path,
+        'echo secret | %s/bin/ftpasswd --name=bob --stdin' %
+        self.computer_partition_root_path,
         shell=True)
     self.assertTrue(self._getConnection(username='bob', password='secret'))
 
@@ -177,7 +177,8 @@ class TestBan(ProFTPdTestCase):
   def test_client_are_banned_after_5_wrong_passwords(self):
     # Simulate failed 5 login attempts
     for i in range(5):
-      with self.assertRaisesRegexp(AuthenticationException, 'Authentication failed'):
+      with self.assertRaisesRegexp(AuthenticationException,
+                                   'Authentication failed'):
         self._getConnection(password='wrong')
 
     # after that, even with a valid password we cannot connect
@@ -185,8 +186,10 @@ class TestBan(ProFTPdTestCase):
       self._getConnection()
 
     # ban event is logged
-    with open(os.path.join(
-        self.computer_partition_root_path, 'var', 'log', 'proftpd-ban.log')) as ban_log_file:
+    with open(os.path.join(self.computer_partition_root_path,
+                           'var',
+                           'log',
+                           'proftpd-ban.log')) as ban_log_file:
       self.assertRegexpMatches(
           ban_log_file.readlines()[-1],
           'login from host .* denied due to host ban')
@@ -195,7 +198,7 @@ class TestBan(ProFTPdTestCase):
 class TestInstanceParameterPort(ProFTPdTestCase):
   @classmethod
   def getInstanceParameterDict(cls):
-    cls.free_port = utils.findFreeTCPPort(cls.config['ipv4_address'])
+    cls.free_port = findFreeTCPPort(cls._ipv4_address)
     return {'port': cls.free_port}
 
   def test_instance_parameter_port(self):
@@ -211,7 +214,8 @@ class TestFilesAndSocketsInInstanceDir(ProFTPdTestCase):
   def setUp(self):
     """sets `self.proftpdProcess` to `psutil.Process` for the running proftpd in the instance.
     """
-    all_process_info = self.getSupervisorRPCServer().supervisor.getAllProcessInfo()
+    with self.slap.instance_supervisor_rpc as supervisor:
+      all_process_info = supervisor.getAllProcessInfo()
     # there is only one process in this instance
     process_info, = [p for p in all_process_info if p['name'] != 'watchdog']
     process = psutil.Process(process_info['pid'])
@@ -221,13 +225,15 @@ class TestFilesAndSocketsInInstanceDir(ProFTPdTestCase):
   def test_only_write_file_in_instance_dir(self):
     self.assertEqual(
         [],
-        [f for f in self.proftpdProcess.open_files()
-         if f.mode != 'r'
-         if not f.path.startswith(self.computer_partition_root_path)])
+        [
+            f for f in self.proftpdProcess.open_files() if f.mode != 'r'
+            if not f.path.startswith(self.computer_partition_root_path)
+        ])
 
   def test_only_unix_socket_in_instance_dir(self):
     self.assertEqual(
         [],
-        [s for s in self.proftpdProcess.connections('unix')
-         if not s.laddr.startswith(self.computer_partition_root_path)])
-
+        [
+            s for s in self.proftpdProcess.connections('unix')
+            if not s.laddr.startswith(self.computer_partition_root_path)
+        ])

software/re6stnet/test/setup.py

@@ -25,14 +25,14 @@
 #
 ##############################################################################
 from setuptools import setup, find_packages
-import glob
-import os
 
 version = '0.0.1.dev0'
 name = 'slapos.test.re6stnet'
-long_description = open("README.md").read()
+with open("README.md") as f:
+  long_description = f.read()
 
-setup(name=name,
+setup(
+    name=name,
     version=version,
     description="Test for SlapOS' Re6stnet",
     long_description=long_description,
@@ -51,4 +51,4 @@ setup(name=name,
     ],
     zip_safe=True,
     test_suite='test',
-    )
+)

software/re6stnet/test/test.py

@@ -26,61 +26,40 @@
 ##############################################################################
 
 import os
-import shutil
-import urlparse
-import tempfile
 import requests
-import socket
-import StringIO
-import subprocess
 import json
 
-import utils
 from slapos.recipe.librecipe import generateHashFromFiles
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
-SLAPOS_TEST_IPV4 = os.environ['SLAPOS_TEST_IPV4']
-SLAPOS_TEST_IPV6 = os.environ['SLAPOS_TEST_IPV6']
+setUpModule, Re6stnetTestCase = makeModuleSetUpAndTestCaseClass(
+    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('SLAPOS_TEST_DEBUG'):
-  import logging
-  logging.basicConfig(level=logging.DEBUG)
-  import unittest
-  unittest.installHandler()
-
-
-class Re6stnetTestCase(utils.SlapOSInstanceTestCase):
-  def setUp(self):
-    import logging
-
-    utils.SlapOSInstanceTestCase.setUp(self)
-    self.logger = logging.getLogger(__name__)
-
-  @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg')), )
-
 class TestRe6stnetRegistry(Re6stnetTestCase):
-
   def test_listen(self):
     connection_parameters = self.computer_partition.getConnectionParameterDict()
     registry_url = connection_parameters['re6stry-local-url']
 
     _ = requests.get(registry_url)
 
-class TestPortRedirection(Re6stnetTestCase):
 
+class TestPortRedirection(Re6stnetTestCase):
   def test_portredir_config(self):
-    portredir_config_path = os.path.join(self.computer_partition_root_path, '.slapos-port-redirect')
+    portredir_config_path = os.path.join(
+        self.computer_partition_root_path, '.slapos-port-redirect')
     with open(portredir_config_path) as f:
       portredir_config = json.load(f)
 
-    self.assertDictContainsSubset({
+    self.assertDictContainsSubset(
+        {
             'srcPort': 9201,
             'destPort': 9201,
         }, portredir_config[0])
 
+
+
 class ServicesTestCase(Re6stnetTestCase):
 
   @classmethod
@@ -95,12 +74,15 @@ class ServicesTestCase(Re6stnetTestCase):
         'httpd-{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)
-                  for path in hash_files]
+    hash_files = [
+        os.path.join(self.computer_partition_root_path, path)
+        for path in hash_files
+    ]
 
     for name in expected_process_names:
       h = generateHashFromFiles(hash_files)

software/seleniumserver/test/setup.py

@@ -28,9 +28,11 @@ from setuptools import setup, find_packages
 
 version = '0.0.1.dev0'
 name = 'slapos.test.seleniumserver'
-long_description = open("README.md").read()
+with open("README.md") as f:
+  long_description = f.read()
 
-setup(name=name,
+setup(
+    name=name,
     version=version,
     description="Test for SlapOS' Selenium Server",
     long_description=long_description,
@@ -52,4 +54,4 @@ setup(name=name,
     ],
     zip_safe=True,
     test_suite='test',
-    )
+)

software/seleniumserver/test/test.py

@@ -47,14 +47,12 @@ from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
-from utils import SlapOSInstanceTestCase, findFreeTCPPort
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+from slapos.testing.utils import findFreeTCPPort
 
-debug_mode = os.environ.get('SLAPOS_TEST_DEBUG')
-# for development: debugging logs and install Ctrl+C handler
-if debug_mode:
-  import logging
-  logging.basicConfig(level=logging.DEBUG)
-  unittest.installHandler()
+setUpModule, SeleniumServerTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
 
 
 class WebServerMixin(object):
@@ -71,12 +69,14 @@ class WebServerMixin(object):
        - upload a file and the file content will be displayed in div.uploadedfile
       """
       def log_message(self, *args, **kw):
-        if debug_mode:
+        if SeleniumServerTestCase._debug:
           BaseHTTPRequestHandler.log_message(self, *args, **kw)
+
       def do_GET(self):
         self.send_response(200)
         self.end_headers()
-        self.wfile.write('''
+        self.wfile.write(
+            '''
           <html>
             <title>Test page</title>
             <body>
@@ -87,18 +87,22 @@ class WebServerMixin(object):
               </form>
             </body>
           </html>''')
+
       def do_POST(self):
         form = cgi.FieldStorage(
             fp=self.rfile,
             headers=self.headers,
-            environ={'REQUEST_METHOD':'POST',
-                     'CONTENT_TYPE':self.headers['Content-Type'],})
+            environ={
+                'REQUEST_METHOD': 'POST',
+                'CONTENT_TYPE': self.headers['Content-Type'],
+            })
         self.send_response(200)
         self.end_headers()
         file_data = 'no file'
         if form.has_key('f'):
           file_data = form['f'].file.read()
-        self.wfile.write('''
+        self.wfile.write(
+            '''
           <html>
             <title>%s</title>
             <div>%s</div>
@@ -128,7 +132,8 @@ class BrowserCompatibilityMixin(WebServerMixin):
   def setUp(self):
     super(BrowserCompatibilityMixin, self).setUp()
     self.driver = webdriver.Remote(
-         command_executor=self.computer_partition.getConnectionParameterDict()['backend-url'],
+        command_executor=self.computer_partition.getConnectionParameterDict()
+        ['backend-url'],
         desired_capabilities=self.desired_capabilities)
 
   def tearDown(self):
@@ -158,9 +163,7 @@ class BrowserCompatibilityMixin(WebServerMixin):
     self.driver.find_element_by_xpath('//input[@name="f"]').send_keys(f.name)
     self.driver.find_element_by_xpath('//input[@type="submit"]').click()
 
-    self.assertEqual(
-        self.id(),
-        self.driver.find_element_by_xpath('//div').text)
+    self.assertEqual(self.id(), self.driver.find_element_by_xpath('//div').text)
 
   def test_screenshot(self):
     self.driver.get(self.server_url)
@@ -169,7 +172,9 @@ class BrowserCompatibilityMixin(WebServerMixin):
     self.assertGreater(len(screenshot.getcolors(maxcolors=512)), 2)
 
   def test_window_and_screen_size(self):
-    size = json.loads(self.driver.execute_script('''
+    size = json.loads(
+        self.driver.execute_script(
+            '''
       return JSON.stringify({
         'screen.width': window.screen.width,
         'screen.height': window.screen.height,
@@ -188,7 +193,9 @@ class BrowserCompatibilityMixin(WebServerMixin):
 
   def test_resize_window(self):
     self.driver.set_window_size(800, 900)
-    size = json.loads(self.driver.execute_script('''
+    size = json.loads(
+        self.driver.execute_script(
+            '''
       return JSON.stringify({
         'outerWidth': window.outerWidth,
         'outerHeight': window.outerHeight
@@ -201,6 +208,7 @@ class BrowserCompatibilityMixin(WebServerMixin):
     webdriver_url = parameter_dict['backend-url']
 
     queue = multiprocessing.Queue()
+
     def _test(q, server_url):
       driver = webdriver.Remote(
           command_executor=webdriver_url,
@@ -213,10 +221,9 @@ class BrowserCompatibilityMixin(WebServerMixin):
 
     nb_workers = 10
     workers = []
-    for i in range(nb_workers):
+    for _ in range(nb_workers):
       worker = multiprocessing.Process(
-          target=_test,
-          args=(queue, self.server_url))
+          target=_test, args=(queue, self.server_url))
 
       worker.start()
       workers.append(worker)
@@ -229,16 +236,7 @@ class BrowserCompatibilityMixin(WebServerMixin):
 
     del _  # pylint
     self.assertEqual(
-        [True] * nb_workers,
-        [queue.get() for _ in range(nb_workers)])
-
-
-class SeleniumServerTestCase(SlapOSInstanceTestCase):
-  """Test the remote driver on a minimal web server.
-  """
-  @classmethod
-  def getSoftwareURLList(cls):
-    return (os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg')), )
+        [True] * nb_workers, [queue.get() for _ in range(nb_workers)])
 
 
 class TestBrowserSelection(WebServerMixin, SeleniumServerTestCase):
@@ -255,12 +253,9 @@ class TestBrowserSelection(WebServerMixin, SeleniumServerTestCase):
     driver.get(self.server_url)
     self.assertEqual('Test page', driver.title)
 
-    self.assertIn(
-        'Chrome',
-        driver.execute_script('return navigator.userAgent'))
+    self.assertIn('Chrome', driver.execute_script('return navigator.userAgent'))
     self.assertNotIn(
-        'Firefox',
-        driver.execute_script('return navigator.userAgent'))
+        'Firefox', driver.execute_script('return navigator.userAgent'))
     driver.quit()
 
   def test_firefox(self):
@@ -275,8 +270,7 @@ class TestBrowserSelection(WebServerMixin, SeleniumServerTestCase):
     self.assertEqual('Test page', driver.title)
 
     self.assertIn(
-        'Firefox',
-        driver.execute_script('return navigator.userAgent'))
+        'Firefox', driver.execute_script('return navigator.userAgent'))
     driver.quit()
 
   def test_firefox_desired_version(self):
@@ -313,9 +307,7 @@ class TestFrontend(WebServerMixin, SeleniumServerTestCase):
     self.assertEqual('admin', parsed.username)
     self.assertTrue(parsed.password)
 
-    self.assertIn(
-        'Grid Console',
-        requests.get(admin_url, verify=False).text)
+    self.assertIn('Grid Console', requests.get(admin_url, verify=False).text)
 
   def test_browser_use_hub(self):
     parameter_dict = self.computer_partition.getConnectionParameterDict()
@@ -346,11 +338,13 @@ class TestSSHServer(SeleniumServerTestCase):
     self.assertEqual('ssh', parsed.scheme)
 
     client = paramiko.SSHClient()
+
     class TestKeyPolicy(object):
       """Accept server key and keep it in self.key for inspection
       """
       def missing_host_key(self, client, hostname, key):
         self.key = key
+
     key_policy = TestKeyPolicy()
     client.set_missing_host_key_policy(key_policy)
 
@@ -366,7 +360,8 @@ class TestSSHServer(SeleniumServerTestCase):
       # The publish format is the raw output of ssh-keygen and is something like this:
       #   521 SHA256:9aZruv3LmFizzueIFdkd78eGtzghDoPSCBXFkkrHqXE user@hostname (ECDSA)
       # we only want to parse SHA256:9aZruv3LmFizzueIFdkd78eGtzghDoPSCBXFkkrHqXE
-      _, fingerprint_string, _, key_type = parameter_dict['ssh-fingerprint'].split()
+      _, fingerprint_string, _, key_type = parameter_dict[
+          'ssh-fingerprint'].split()
       self.assertEqual(key_type, '(ECDSA)')
 
       fingerprint_algorithm, fingerprint = fingerprint_string.split(':', 1)
@@ -376,16 +371,21 @@ class TestSSHServer(SeleniumServerTestCase):
       self.assertEqual(
           fingerprint,
           # XXX with sha256, we need to remove that trailing =
-        base64.b64encode(hashlib.new(fingerprint_algorithm, key_policy.key.asbytes()).digest())[:-1]
-      )
+          base64.b64encode(
+              hashlib.new(fingerprint_algorithm,
+                          key_policy.key.asbytes()).digest())[:-1])
 
       channel = client.invoke_shell()
       channel.settimeout(30)
-      # apparently we sometimes need to send something on the first ssh connection
-      channel.send('\n')
-      # openssh prints a warning 'Attempt to write login records by non-root user (aborting)'
-      # so we received more than the lenght of the asserted message.
-      self.assertIn("Welcome to SlapOS Selenium Server.", channel.recv(100))
+      received = ''
+      while True:
+        r = channel.recv(1024)
+        if not r:
+          break
+        received += r
+        if 'Selenium Server.' in received:
+          break
+      self.assertIn("Welcome to SlapOS Selenium Server.", received)
 
 
 class TestFirefox52(BrowserCompatibilityMixin, SeleniumServerTestCase):

software/slapos-sr-testing/software.cfg

@@ -112,6 +112,7 @@ eggs =
   ${bcrypt:egg}
   slapos.libnetworkcache
   slapos.core
+  supervisor
   ${slapos.cookbook-setup:egg}
   ${slapos.test.caddy-frontend-setup:egg}
   ${slapos.test.erp5-setup:egg}
@@ -128,12 +129,13 @@ eggs =
   ${slapos.test.nextcloud-setup:egg}
   ${slapos.test.turnserver-setup:egg}
   ${backports.lzma:egg}
-
 entry-points =
   runTestSuite=erp5.util.testsuite:runTestSuite
 scripts =
   runTestSuite
   slapos
+  supervisorctl
+  supervisord
 interpreter=
   python_for_test
 

software/slaprunner/test/setup.py

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

software/slaprunner/test/test.py

@@ -26,35 +26,21 @@
 ##############################################################################
 
 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.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):
     hash_files = [
       'software_release/buildout.cfg',
@@ -71,9 +57,10 @@ class ServicesTestCase(InstanceTestCase):
       '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)
                   for path in hash_files]

software/turnserver/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+
+[instance-cfg]
+filename = instance.cfg.in
+md5sum = d027a2dccaf15ae6e7d3a28cc02d70c3
+
+[template-turnserver]
+filename = instance-turnserver.cfg.jinja2.in
+md5sum = 6ba54fb299e1fd59617e5a6a9545e36e

software/turnserver/instance-turnserver.cfg.jinja2.in

@@ -109,8 +109,12 @@ mode = 644
 
 [turnserver-wrapper]
 recipe = slapos.cookbook:wrapper
-command-line = {{ parameter_dict['turnserver-location'] }}/bin/turnserver
-               -c ${turnserver-config:output}
+# XXX on first invocation of read-secret, the secret file is not yet generated
+# so on first buildout run turnserver-config has an empty secret.
+# We don't want to start the server when config file is not complete.
+command-line =
+  bash -c "egrep static-auth-secret=.+ ${turnserver-config:output} && \
+  {{ parameter_dict['turnserver-location'] }}/bin/turnserver -c ${turnserver-config:output}"
 wrapper-path = ${directory:services}/turnserver
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 

software/turnserver/software.cfg

@@ -7,6 +7,7 @@ extends =
   ../../component/socat/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
+  buildout.hash.cfg
 
 
 parts +=
@@ -22,14 +23,11 @@ mode = 644
 
 [instance-cfg]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg.in
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/instance.cfg
-md5sum = d027a2dccaf15ae6e7d3a28cc02d70c3
 
 [template-turnserver]
 <= download-base
-filename = instance-turnserver.cfg.jinja2.in
-md5sum = f275df4900a9db1d1a72b67b12ee8afe
 
 [versions]
 slapos.recipe.template = 4.3

software/turnserver/test/test.py

@@ -31,33 +31,34 @@ import json
 import glob
 import ConfigParser
 
-import utils
 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()
 
-def subprocess_status_output(*args, **kwargs):
-  prc = subprocess.Popen(
-    stdout=subprocess.PIPE,
-    stderr=subprocess.STDOUT,
-    *args,
-    **kwargs)
-  out, err = prc.communicate()
-  return prc.returncode, out
+setUpModule, InstanceTestCase = 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 TurnServerTestCase(InstanceTestCase):
+
+  partition_path = None
+
+  def setUp(self):
+    # Lookup the partition in which turnserver was installed.
+    partition_path_list = glob.glob(os.path.join(
+      self.slap.instance_directory, '*'))
+    for partition_path in partition_path_list:
+      if os.path.exists(os.path.join(partition_path, 'etc/turnserver.conf')):
+        self.partition_path = partition_path
+        break
+
+    self.assertTrue(
+        self.partition_path,
+        "Turnserver path not found in %r" % (partition_path_list,))
 
 
-class ServicesTestCase(InstanceTestCase):
+class TestServices(TurnServerTestCase):
 
   def test_process_list(self):
     hash_list = [
@@ -72,7 +73,7 @@ class ServicesTestCase(InstanceTestCase):
       'monitor-httpd-graceful',
     ]
 
-    supervisor = self.getSupervisorRPCServer().supervisor
+    with self.slap.instance_supervisor_rpc as supervisor:
       process_name_list = [process['name']
                      for process in supervisor.getAllProcessInfo()]
 
@@ -86,19 +87,14 @@ class ServicesTestCase(InstanceTestCase):
       self.assertIn(expected_process_name, process_name_list)
 
   def test_default_deployment(self):
-    partition_path_list = glob.glob(os.path.join(self.instance_path, '*'))
-    instance_folder = None
-    for partition_path in partition_path_list:
-      if os.path.exists(os.path.join(partition_path, 'etc/turnserver.conf')):
-        instance_folder = partition_path
-        break
-
-    secret_file = os.path.join(instance_folder, 'etc/.turnsecret')
-    self.assertTrue(os.path.exists(instance_folder))
+    secret_file = os.path.join(self.partition_path, 'etc/.turnsecret')
+    self.assertTrue(os.path.exists(self.partition_path))
     self.assertTrue(os.path.exists(secret_file))
     config = ConfigParser.ConfigParser()
-    config.readfp(open(secret_file))
+    with open(secret_file) as f:
+      config.readfp(f)
     secret = config.get('turnserver', 'secret')
+    self.assertTrue(secret)
 
     expected_config = """listening-port=3478
 tls-listening-port=5349
@@ -125,70 +121,15 @@ no-stdout-log
 log-file=%(instance_path)s/var/log/turnserver.log
 userdb=%(instance_path)s/srv/turndb
 pidfile=%(instance_path)s/var/run/turnserver.pid
-verbose""" % {'instance_path': instance_folder, 'secret': secret, 'ipv4': self.config['ipv4_address']}
+verbose""" % {'instance_path': self.partition_path, 'secret': secret, 'ipv4': self._ipv4_address}
 
-    with open(os.path.join(instance_folder, 'etc/turnserver.conf')) as f:
+    with open(os.path.join(self.partition_path, 'etc/turnserver.conf')) as f:
       current_config = f.read().strip()
 
-    self.assertEqual(current_config, expected_config)
+    self.assertEqual(current_config.splitlines(), expected_config.splitlines())
 
-  def test_turnserver_promises(self):
-    partition_path_list = glob.glob(os.path.join(self.instance_path, '*'))
-    instance_folder = None
-    for partition_path in partition_path_list:
-      if os.path.exists(os.path.join(partition_path, 'etc/turnserver.conf')):
-        instance_folder = partition_path
-        break
-    self.assertTrue(os.path.exists(instance_folder))
-
-    promise_path_list = glob.glob(os.path.join(instance_folder, 'etc/plugin/*.py'))
-    promise_name_list = [x for x in
-                         os.listdir(os.path.join(instance_folder, 'etc/plugin'))
-                         if not x.endswith('.pyc')]
-    partition_name = os.path.basename(instance_folder.rstrip('/'))
-    self.assertEqual(sorted(promise_name_list),
-                    sorted([
-                      "__init__.py",
-                      "check-free-disk-space.py",
-                      "monitor-http-frontend.py",
-                      "buildout-%s-status.py" % partition_name,
-                      "monitor-bootstrap-status.py",
-                      "monitor-httpd-listening-on-tcp.py",
-                      "turnserver-port-listening.py",
-                      "turnserver-tls-port-listening.py",
-                    ]))
 
-    ignored_plugin_list = [
-      '__init__.py',
-      'monitor-http-frontend.py',
-    ]
-    runpromise_bin = os.path.join(
-      self.software_path, 'bin', 'monitor.runpromise')
-    monitor_conf = os.path.join(instance_folder, 'etc', 'monitor.conf')
-    msg = []
-    status = 0
-    for plugin_path in promise_path_list:
-      plugin_name = os.path.basename(plugin_path)
-      if plugin_name in ignored_plugin_list:
-        continue
-      plugin_status, plugin_result = subprocess_status_output([
-        runpromise_bin,
-        '-c', monitor_conf,
-        '--run-only', plugin_name,
-        '--force',
-        '--check-anomaly'
-      ])
-      status += plugin_status
-      if plugin_status == 1:
-        msg.append(plugin_result)
-      # sanity check
-      if 'Checking promise %s' % plugin_name not in plugin_result:
-        plugin_status = 1
-        msg.append(plugin_result)
-    msg = ''.join(msg).strip()
-    self.assertEqual(status, 0, msg)
-
-class ParametersTestCase(InstanceTestCase):
+class TestParameters(TurnServerTestCase):
   @classmethod
   def getInstanceParameterDict(cls):
     return {
@@ -200,19 +141,14 @@ class ParametersTestCase(InstanceTestCase):
     }
 
   def test_turnserver_with_parameters(self):
-    partition_path_list = glob.glob(os.path.join(self.instance_path, '*'))
-    instance_folder = None
-    for partition_path in partition_path_list:
-      if os.path.exists(os.path.join(partition_path, 'etc/turnserver.conf')):
-        instance_folder = partition_path
-        break
-
-    secret_file = os.path.join(instance_folder, 'etc/.turnsecret')
-    self.assertTrue(os.path.exists(instance_folder))
+    secret_file = os.path.join(self.partition_path, 'etc/.turnsecret')
+    self.assertTrue(os.path.exists(self.partition_path))
     self.assertTrue(os.path.exists(secret_file))
     config = ConfigParser.ConfigParser()
-    config.readfp(open(secret_file))
+    with open(secret_file) as f:
+      config.readfp(f)
     secret = config.get('turnserver', 'secret')
+    self.assertTrue(secret)
 
     expected_config = """listening-port=%(port)s
 tls-listening-port=%(tls_port)s
@@ -240,7 +176,7 @@ no-stdout-log
 log-file=%(instance_path)s/var/log/turnserver.log
 userdb=%(instance_path)s/srv/turndb
 pidfile=%(instance_path)s/var/run/turnserver.pid
-verbose""" % {'instance_path': instance_folder,
+verbose""" % {'instance_path': self.partition_path,
               'secret': secret,
               'ipv4': '127.0.0.1',
               'name': 'turn.site.com',
@@ -248,9 +184,7 @@ verbose""" % {'instance_path': instance_folder,
               'port': 3488,
               'tls_port': 5369,}
 
-    with open(os.path.join(instance_folder, 'etc/turnserver.conf')) as f:
+    with open(os.path.join(self.partition_path, 'etc/turnserver.conf')) as f:
       current_config = f.read().strip()
 
-    self.assertEqual(current_config, expected_config)
-
-
+    self.assertEqual(current_config.splitlines(), expected_config.splitlines())

stack/slapos.cfg

@@ -137,7 +137,7 @@ pytz = 2016.10
 requests = 2.13.0
 six = 1.12.0
 slapos.cookbook = 1.0.123
-slapos.core = 1.4.28
+slapos.core = 1.5.0
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.19
@@ -154,7 +154,7 @@ CacheControl = 0.12.5
 msgpack = 0.6.1
 
 # Required by:
-# slapos.core==1.4.26
+# slapos.core==1.5.0
 Flask = 0.12
 
 # Required by:
@@ -226,7 +226,7 @@ jsonschema = 3.0.2
 lockfile = 0.12.2
 
 # Required by:
-# slapos.core==1.4.26
+# slapos.core==1.5.0
 # XXX 'slapos node format' raises an exception with netifaces 0.10.5.
 netifaces = 0.10.7
 
@@ -259,7 +259,7 @@ python-dateutil = 2.7.3
 rpdb = 0.1.5
 
 # Required by:
-# slapos.core==1.4.26
+# slapos.core==1.5.0
 supervisor = 3.3.3
 
 # Required by:
@@ -267,11 +267,11 @@ supervisor = 3.3.3
 tzlocal = 1.5.1
 
 # Required by:
-# slapos.core==1.4.26
+# slapos.core==1.5.0
 uritemplate = 3.0.0
 
 # Required by:
-# slapos.core==1.4.26
+# slapos.core==1.5.0
 zope.interface = 4.3.3
 
 [networkcache]