IMPALA-4990: fix run_tests.py --update_results Seems to have broken with some recent commits.
Change-Id: I9c22e197662228158d7935ebfb12d9b3691eb499 Reviewed-on: http://gerrit.cloudera.org:8080/6151 Reviewed-by: Dan Hecht <[email protected]> Tested-by: Impala Public Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/5f323124 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/5f323124 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/5f323124 Branch: refs/heads/master Commit: 5f323124ae4e68e4022f0d7be5d0872988124eb0 Parents: 57dae5e Author: Dan Hecht <[email protected]> Authored: Fri Feb 24 15:07:24 2017 -0800 Committer: Impala Public Jenkins <[email protected]> Committed: Wed Aug 23 04:49:13 2017 +0000 ---------------------------------------------------------------------- tests/common/test_result_verifier.py | 2 +- tests/util/test_file_parser.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5f323124/tests/common/test_result_verifier.py ---------------------------------------------------------------------- diff --git a/tests/common/test_result_verifier.py b/tests/common/test_result_verifier.py index 7e929f1..a22e0d4 100644 --- a/tests/common/test_result_verifier.py +++ b/tests/common/test_result_verifier.py @@ -404,7 +404,7 @@ def verify_raw_results(test_section, exec_result, file_format, update_section=Fa VERIFIER_MAP[verifier](expected, actual) except AssertionError: if update_section: - test_section[results_section] = join_section_lines(actual.result_list) + test_section[result_section] = join_section_lines(actual.result_list) else: raise http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5f323124/tests/util/test_file_parser.py ---------------------------------------------------------------------- diff --git a/tests/util/test_file_parser.py b/tests/util/test_file_parser.py index 9850b18..89149ab 100644 --- a/tests/util/test_file_parser.py +++ b/tests/util/test_file_parser.py @@ -291,7 +291,8 @@ def write_test_file(test_file_name, test_file_sections, encoding=None): if section_name == 'RESULTS' and test_case.get('VERIFIER'): full_section_name = '%s: %s' % (section_name, test_case['VERIFIER']) test_file_text.append("%s %s" % (SUBSECTION_DELIMITER, full_section_name)) - if test_case[section_name].strip(): - test_file_text.append(test_case[section_name]) + section_value = ''.join(test_case[section_name]) + if section_value.strip(): + test_file_text.append(section_value) test_file_text.append(SECTION_DELIMITER) test_file.write(('\n').join(test_file_text))
