From 0334cf11cc7dab63bf7e95f4e970960350eac0b6 Mon Sep 17 00:00:00 2001 From: Anna Kogan Date: Thu, 10 Jan 2013 13:16:46 +0400 Subject: [PATCH 1/3] Fixed last testsuit disregarding --- modules/ts/misc/perf_tests_timing.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/ts/misc/perf_tests_timing.py b/modules/ts/misc/perf_tests_timing.py index 70d2aa2f0..bf9d06c3c 100644 --- a/modules/ts/misc/perf_tests_timing.py +++ b/modules/ts/misc/perf_tests_timing.py @@ -81,6 +81,9 @@ if __name__ == "__main__": if case.get('status') == 'failed': has_failed = True + testsuits.append({'name': prevGroupName, 'time': suit_time, \ + 'failed': has_failed}) + tbl = table() # header From 0d7ce141aad0d5c908d077f29e69f74dd7fac863 Mon Sep 17 00:00:00 2001 From: Anna Kogan Date: Thu, 10 Jan 2013 13:18:26 +0400 Subject: [PATCH 2/3] Cleaned code --- modules/ts/misc/perf_tests_timing.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/ts/misc/perf_tests_timing.py b/modules/ts/misc/perf_tests_timing.py index bf9d06c3c..4a9f39af7 100644 --- a/modules/ts/misc/perf_tests_timing.py +++ b/modules/ts/misc/perf_tests_timing.py @@ -21,14 +21,12 @@ if __name__ == "__main__": options.generateHtml = detectHtmlOutputType(options.format) - # expand wildcards and filter duplicates file = os.path.abspath(args[0]) if not os.path.isfile(file): sys.stderr.write("IOError reading \"" + file + "\" - " + str(err) + os.linesep) parser.print_help() exit(0) - # read all passed files test_sets = [] try: tests = testlog_parser.parseLogFile(file) @@ -41,7 +39,7 @@ if __name__ == "__main__": if not test_sets: sys.stderr.write("Error: no test data found" + os.linesep) - quit() + exit(0) # find matches setsCount = len(test_sets) @@ -84,6 +82,10 @@ if __name__ == "__main__": testsuits.append({'name': prevGroupName, 'time': suit_time, \ 'failed': has_failed}) + if len(testsuits)==0: + print 'No testsuits found' + exit(0) + tbl = table() # header From 3271e395c84a0f8298cbee3c8efdd00ea6decbf3 Mon Sep 17 00:00:00 2001 From: Anna Kogan Date: Thu, 10 Jan 2013 13:19:59 +0400 Subject: [PATCH 3/3] Improved console output --- modules/ts/misc/perf_tests_timing.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/ts/misc/perf_tests_timing.py b/modules/ts/misc/perf_tests_timing.py index 4a9f39af7..781bfdfd2 100644 --- a/modules/ts/misc/perf_tests_timing.py +++ b/modules/ts/misc/perf_tests_timing.py @@ -5,6 +5,7 @@ from table_formatter import * from optparse import OptionParser from operator import itemgetter, attrgetter from summary import getSetName, alphanum_keyselector +import re if __name__ == "__main__": usage = "%prog .xml [...]" @@ -21,7 +22,8 @@ if __name__ == "__main__": options.generateHtml = detectHtmlOutputType(options.format) - file = os.path.abspath(args[0]) + input_file = args[0] + file = os.path.abspath(input_file) if not os.path.isfile(file): sys.stderr.write("IOError reading \"" + file + "\" - " + str(err) + os.linesep) parser.print_help() @@ -108,4 +110,11 @@ if __name__ == "__main__": tbl.htmlPrintTable(sys.stdout) htmlPrintFooter(sys.stdout) else: - tbl.consolePrintTable(sys.stdout) \ No newline at end of file + input_file = re.sub(r'^[\.\/]*', '', input_file) + find_module_name = re.search(r'([^_]*)', input_file) + module_name = find_module_name.group(0) + + splitter = 15 * '*' + print '\n%s\n %s\n%s\n' % (splitter, module_name, splitter) + tbl.consolePrintTable(sys.stdout) + print 4 * '\n' \ No newline at end of file