test

software/proftpd/test/utils.py

@@ -35,13 +35,12 @@ from erp5.util.testnode.SlapOSControler import SlapOSControler
 from erp5.util.testnode.ProcessManager import ProcessManager
 import slapos
 
-logger = logging.getLogger(__name__)
 
 def findFreeTCPPort(ip=''):
   """Find a free TCP port to listen to.
-  inspired by https://stackoverflow.com/a/45690594
   """
-  with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
+  family = socket.AF_INET6 if ':' in ip else socket.AF_INET
+  with closing(socket.socket(family, socket.SOCK_STREAM)) as s:
     s.bind((ip, 0))
     return s.getsockname()[1]
 
@@ -59,10 +58,13 @@ class SlapOSInstanceTestCase(unittest.TestCase):
   def getInstanceParmeterDict(cls):
     """Return instance parameters
 
-    To be defined by subclasses if needed
+    To be defined by subclasses if they need to request instance with specific
+    parameters.
     """
     return {}
 
+ # TODO: software type ?
+
   @classmethod
   def setUpClass(cls):
 
@@ -104,6 +106,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
     )
 
     slapproxy_log = os.path.join(config['log_directory'], 'slapproxy.log')
+    logger = logging.getLogger(__name__)
     logger.debug('Configured slapproxy log to %r', slapproxy_log)
 
     software_url_list = cls.getSoftwareURLList()
@@ -151,6 +154,6 @@ class SlapOSInstanceTestCase(unittest.TestCase):
 
   @classmethod
   def tearDownClass(cls):
-    print "Teardown", cls
     # FIXME: if setUpClass fail, this is not called and leaks zombie processes
     cls._process_manager.killPreviousRun()
+