From 777d74610544d0311250c2321d9efd8f719b3439 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 19 Feb 2020 06:53:42 +0100 Subject: Report: Sort tests in tables Change-Id: I862a35270a72d66d7cc3c0eaf5fb2bff20dcac7d Signed-off-by: Tibor Frank (cherry picked from commit a4e15f5d5ab4bf94fd40deca12bf9a1787535ab3) --- resources/tools/presentation/generator_tables.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'resources/tools/presentation/generator_tables.py') diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 7a25ab7060..25e827049e 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -96,7 +96,14 @@ def table_oper_data_html(table, input_data): if data.empty: return data = input_data.merge_data(data) - data.sort_index(inplace=True) + + sort_tests = table.get(u"sort", None) + if sort_tests and sort_tests in (u"ascending", u"descending"): + args = dict( + inplace=True, + ascending=True if sort_tests == u"ascending" else False + ) + data.sort_index(**args) suites = input_data.filter_data( table, @@ -284,12 +291,15 @@ def table_merged_details(table, input_data): ) data = input_data.filter_data(table, continue_on_error=True) data = input_data.merge_data(data) - data.sort_index(inplace=True) - logging.info( - f" Creating the data set for the {table.get(u'type', u'')} " - f"{table.get(u'title', u'')}." - ) + sort_tests = table.get(u"sort", None) + if sort_tests and sort_tests in (u"ascending", u"descending"): + args = dict( + inplace=True, + ascending=True if sort_tests == u"ascending" else False + ) + data.sort_index(**args) + suites = input_data.filter_data( table, continue_on_error=True, data_set=u"suites") suites = input_data.merge_data(suites) -- cgit 1.2.3-korg