Commit d6b10742 authored by Thomas Gambier's avatar Thomas Gambier

testnode: remove old compatibility code

The compatibility code was introduced in
59ee7970 but it's not needed anymore as
the binaries are located in bin/ directory
parent d303ca49
...@@ -158,16 +158,15 @@ class UnitTestRunner(object): ...@@ -158,16 +158,15 @@ class UnitTestRunner(object):
SLAPOS_TEST_LOG_DIRECTORY = node_test_suite.log_folder_path SLAPOS_TEST_LOG_DIRECTORY = node_test_suite.log_folder_path
supported_parameter_set = set(self.testnode.process_manager supported_parameter_set = set(self.testnode.process_manager
.getSupportedParameterList(run_test_suite_path)) .getSupportedParameterList(run_test_suite_path))
def path(name, compat): # BBB def path(name):
path, = filter(os.path.exists, (base + relative path, = filter(os.path.exists, (software + '/bin/' + name
for relative in ('/bin/' + name, '/parts/' + compat) for software in software_list))
for base in software_list))
return path return path
for option, value in ( for option, value in (
('--firefox_bin', lambda: path('firefox', 'firefox/firefox-slapos')), ('--firefox_bin', lambda: path('firefox')),
('--frontend_url', lambda: config['frontend_url']), ('--frontend_url', lambda: config['frontend_url']),
('--node_quantity', lambda: config['node_quantity']), ('--node_quantity', lambda: config['node_quantity']),
('--xvfb_bin', lambda: path('xvfb', 'xserver/bin/Xvfb')), ('--xvfb_bin', lambda: path('xvfb')),
('--project_title', lambda: node_test_suite.project_title), ('--project_title', lambda: node_test_suite.project_title),
('--shared_part_list', lambda: SLAPOS_TEST_SHARED_PART_LIST), ('--shared_part_list', lambda: SLAPOS_TEST_SHARED_PART_LIST),
('--log_directory', lambda: SLAPOS_TEST_LOG_DIRECTORY), ('--log_directory', lambda: SLAPOS_TEST_LOG_DIRECTORY),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment