slapos-master/test: use slapos.testing

/reviewed-on !635

software/slapos-master/test/README.md

-Tests for ERP5 software release
+Tests for Slapos Master software release

software/slapos-master/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/slapos-master/test/test/test_erp5.py

@@ -29,26 +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):
@@ -61,9 +50,10 @@ class TestPublishedURLIsReachableMixin(object):
     # with 503 Service Unavailable.
     # 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)
@@ -89,13 +79,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 TestDisableTestRunner(ERP5TestCase, TestPublishedURLIsReachableMixin):
+class TestDisableTestRunner(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
   """Test ERP5 can be instanciated without test runner.
   """
   __partition_reference__ = 'distr'