erp5.util.testnode: fix values of --firefox_bin and --xvfb_bin

Firefox and Xvfb aren not provided by the tested SR,
but rather by a separate SR that is installed by the testnode.

erp5/tests/testERP5TestNode.py

@@ -87,6 +87,8 @@ 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/"
+    config["software_list"] = ["foo", "bar"]
 
     return TestNode(self.log, config)
 
@@ -530,20 +532,21 @@ develop = false
           expected_parameter_list.extend(additional_parameter_list)
         self.assertEqual(call_parameter_list[0]['args'], expected_parameter_list)
 
-      call_parameter_list = []
+    def part(path): # in "bar" SR
+      path = test_node.config['slapos_directory'] \
+        + '/soft/37b51d194a7513e45b56f6524f2d51f2/parts/' + path
+      os.makedirs(os.path.dirname(path))
+      os.close(os.open(path, os.O_CREAT))
+      return path
+    for option in (
+        ('--firefox_bin', part('firefox/firefox-slapos')),
+        ('--frontend_url', 'http://frontend/'),
+        ('--node_quantity', 3),
+        ('--xvfb_bin', part('xserver/bin/Xvfb')),
+      ):
+      parser.add_argument(option[0])
+      expected_parameter_list += option
       checkRunTestSuiteParameters()
-      _createPath(os.path.join(test_node.config['slapos_directory'], 'soft/a/parts/firefox'),'firefox-slapos')
-      _createPath(os.path.join(test_node.config['slapos_directory'], 'soft/a/parts/xserver/bin'),'Xvfb')
-      call_parameter_list = []
-      checkRunTestSuiteParameters(additional_parameter_list=['--firefox_bin',
-        '%s/soft/a/parts/firefox/firefox-slapos'
-         %(test_node.config['slapos_directory']),
-        '--xvfb_bin',
-        '%s/soft/a/parts/xserver/bin/Xvfb'
-          %(test_node.config['slapos_directory'])])
-    finally:
-      ProcessManager.getSupportedParameterSet = original_getSupportedParameter
-      ProcessManager.spawn = original_spawn
 
   def test_10_prepareSlapOS(self, my_test_type='UnitTest'):
     test_node = self.getTestNode()

erp5/util/testnode/UnitTestRunner.py

@@ -43,6 +43,7 @@ from NodeTestSuite import SlapOSInstance
 from Updater import Updater
 from Utils import dealShebang
 from erp5.util import taskdistribution
+from slapos.grid.utils import md5digest
 
 class UnitTestRunner():
   def __init__(self, testnode):
@@ -142,26 +143,27 @@ class UnitTestRunner():
     run_test_suite_revision = node_test_suite.revision
     # Deal with Shebang size limitation
     invocation_list = dealShebang(run_test_suite_path)
-    invocation_list.extend([run_test_suite_path,
-                           '--test_suite', node_test_suite.test_suite,
+    invocation_list += (run_test_suite_path,
+      '--master_url', portal_url,
       '--revision', node_test_suite.revision,
-                           '--test_suite_title', node_test_suite.test_suite_title,
-                           '--node_quantity', config['node_quantity'],
-                           '--master_url', portal_url])
-    firefox_bin_list = glob.glob("%s/soft/*/parts/firefox/firefox-slapos" % \
-        config["slapos_directory"])
-    if len(firefox_bin_list):
-      parameter_list.append('--firefox_bin')
-    xvfb_bin_list = glob.glob("%s/soft/*/parts/xserver/bin/Xvfb" % \
-        config["slapos_directory"])
-    if len(xvfb_bin_list):
-      parameter_list.append('--xvfb_bin')
-    supported_paramater_set = self.testnode.process_manager.getSupportedParameterSet(
-                           run_test_suite_path, parameter_list)
-    if '--firefox_bin' in supported_paramater_set:
-      invocation_list.extend(["--firefox_bin", firefox_bin_list[0]])
-    if '--xvfb_bin' in supported_paramater_set:
-      invocation_list.extend(["--xvfb_bin", xvfb_bin_list[0]])
+      '--test_suite', node_test_suite.test_suite,
+      '--test_suite_title', node_test_suite.test_suite_title)
+    supported_parameter_set = set(self.testnode.process_manager
+      .getSupportedParameterList(run_test_suite_path))
+    def part(path):
+        path = config['slapos_directory'] + '/soft/%s/parts/' + path
+        path, = filter(os.path.exists, (path % md5digest(software)
+            for software in config['software_list']))
+        return path
+    for option, value in (
+        ('--firefox_bin', lambda: part('firefox/firefox-slapos')),
+        ('--frontend_url', lambda: config['frontend_url']),
+        ('--node_quantity', lambda: config['node_quantity']),
+        ('--xvfb_bin', lambda: part('xserver/bin/Xvfb')),
+        ):
+      if option in supported_parameter_set:
+        invocation_list += option, value()
+
     # TODO : include testnode correction ( b111682f14890bf )
     if hasattr(node_test_suite,'additional_bt5_repository_id'):
       additional_bt5_path = os.path.join(