revert recent work on frontend url for remote ios test

erp5/tests/testERP5TestNode.py

@@ -88,7 +88,6 @@ class ERP5TestNode(TestCase):
     config["server_url"] = "http://foo.bar"
     config["httpd_ip"] = "ff:ff:ff:ff:ff:ff:ff:ff"
     config["httpd_software_access_port"] = "9080"
-    config["frontend_url"] = "http://frontend/"
 
     return TestNode(self.log, config)
 
@@ -518,7 +517,6 @@ shared = true
     parts = slapos_controler.instance_root + '/a/software_release/parts/'
     for option in (
         ('--firefox_bin', parts + 'firefox/firefox-slapos'),
-        ('--frontend_url', 'http://frontend/'),
         ('--node_quantity', 3),
         ('--xvfb_bin', parts + 'xserver/bin/Xvfb'),
       ):

erp5/util/testnode/SlapOSControler.py

@@ -278,9 +278,7 @@ class SlapOSControler(object):
     proxy = subprocess.Popen([config['slapos_binary'], 
       'proxy', 'start', '--cfg' , self.slapos_config], **kwargs)
     process_manager.process_pid_set.add(proxy.pid)
-    # XXX: dirty, giving some time for proxy to being able to accept
-    # connections
-    time.sleep(20)
+    time.sleep(10)
     try:
       slap = slapos.slap.slap()
       self.slap = slap

erp5/util/testnode/UnitTestRunner.py

@@ -151,7 +151,6 @@ class UnitTestRunner():
     parts += '/software_release/parts/'
     for option in (
         ('--firefox_bin', parts + 'firefox/firefox-slapos'),
-        ('--frontend_url', config['frontend_url']),
         ('--node_quantity', config['node_quantity']),
         ('--xvfb_bin', parts + 'xserver/bin/Xvfb'),
         ):

erp5/util/testnode/__init__.py

@@ -92,7 +92,6 @@ def main(*args):
   CONFIG['httpd_url'] = 'https://[%s]:%s' % (CONFIG['httpd_ip'],
         CONFIG['httpd_port'])
   CONFIG['system_temp_folder'] = "/tmp"
-  CONFIG['frontend_url'] = config.get('testnode', 'frontend_url')
 
   # generate vcs_repository_list
   if 'bot_environment' in config.sections():

erp5/util/testsuite/__init__.py

@@ -289,9 +289,6 @@ def runTestSuite():
   parser.add_argument('--master_url',
                       help='The Url of Master controling many suites',
                       default=None)
-  parser.add_argument('--frontend_url',
-                      help='The url of the frontend of this test node',
-                      default=None)
   parser.add_argument('--source_code_path_list',
                       help='List of Eggs folders to test, splited by commam',
                       default='.')