Commit e17936a4 authored by Jérome Perrin's avatar Jérome Perrin

testnode: propagate test_node_title to runTestSuite

runTestSuite accept a --test_node_title argument, which is used in
createTestResult API call, so that task distributor can keep track of which
node executed which task, but since it was not passed, we did not know which
test node executed which test result line.
parent b559f4c5
...@@ -650,7 +650,7 @@ shared = true ...@@ -650,7 +650,7 @@ shared = true
# but the runTestSuite program is called with the actual distributor URL # but the runTestSuite program is called with the actual distributor URL
self.assertEqual( self.assertEqual(
'runTestSuite called with: --master_url https://user:secret@example.com/portal_distributions' 'runTestSuite called with: --master_url https://user:secret@example.com/portal_distributions'
' --revision dummy=0- --test_suite Foo --test_suite_title Foo-Test', ' --revision dummy=0- --test_node_title Foo-Test-Node --test_suite Foo --test_suite_title Foo-Test',
temp_file.read().strip()) temp_file.read().strip())
# The root logger (which logs only in var/log/erp5testnode.log) contain the non obfuscated # The root logger (which logs only in var/log/erp5testnode.log) contain the non obfuscated
...@@ -690,6 +690,7 @@ shared = true ...@@ -690,6 +690,7 @@ shared = true
expected_parameter_list = [path, expected_parameter_list = [path,
'--master_url', 'http://foo.bar', '--master_url', 'http://foo.bar',
'--revision', 'dummy=0-', '--revision', 'dummy=0-',
'--test_node_title', 'Foo-Test-Node',
'--test_suite', 'Foo', '--test_suite', 'Foo',
'--test_suite_title', 'Foo-Test', '--test_suite_title', 'Foo-Test',
] ]
......
...@@ -143,6 +143,7 @@ class UnitTestRunner(object): ...@@ -143,6 +143,7 @@ class UnitTestRunner(object):
invocation_list += (run_test_suite_path, invocation_list += (run_test_suite_path,
'--master_url', portal_url, '--master_url', portal_url,
'--revision', node_test_suite.revision, '--revision', node_test_suite.revision,
'--test_node_title', config['test_node_title'],
'--test_suite', node_test_suite.test_suite, '--test_suite', node_test_suite.test_suite,
'--test_suite_title', node_test_suite.test_suite_title) '--test_suite_title', node_test_suite.test_suite_title)
soft = config['slapos_directory'] + '/soft/' soft = config['slapos_directory'] + '/soft/'
......
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