From 63f13489b1a02bbbc75b46fec6ae7a817442df94 Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Thu, 30 Jun 2016 12:28:31 -0700 Subject: [crosperf] Add more tests for results_report. With this patch, all of the classes in results_report have tests. The tests aren't overly extensive, but we can always improve on them later. This also includes a few small cleanups of parts of machine_manager, and results_report. BUG=None TEST=./run_tests.sh Change-Id: I9613579d4f8c1079b452e1a0a2edf47b189ac1cd Reviewed-on: https://chrome-internal-review.googlesource.com/268057 Commit-Ready: George Burgess Tested-by: George Burgess Reviewed-by: Caroline Tice --- crosperf/results_report.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'crosperf/results_report.py') diff --git a/crosperf/results_report.py b/crosperf/results_report.py index e29c0cab..79a57497 100644 --- a/crosperf/results_report.py +++ b/crosperf/results_report.py @@ -304,20 +304,13 @@ CPUInfo perf_table = self.GetSummaryTables(perf=True) if not perf_table: perf_table = None - if not self.email: - return self.TEXT % ( - self.experiment.name, self.PrintTables(summary_table, 'CONSOLE'), - self.experiment.machine_manager.num_reimages, - self.PrintTables(status_table, 'CONSOLE'), - self.PrintTables(perf_table, 'CONSOLE'), - self.experiment.experiment_file, - self.experiment.machine_manager.GetAllCPUInfo(self.experiment.labels)) - + output_type = 'EMAIL' if self.email else 'CONSOLE' return self.TEXT % ( - self.experiment.name, self.PrintTables(summary_table, 'EMAIL'), + self.experiment.name, self.PrintTables(summary_table, output_type), self.experiment.machine_manager.num_reimages, - self.PrintTables(status_table, 'EMAIL'), - self.PrintTables(perf_table, 'EMAIL'), self.experiment.experiment_file, + self.PrintTables(status_table, output_type), + self.PrintTables(perf_table, output_type), + self.experiment.experiment_file, self.experiment.machine_manager.GetAllCPUInfo(self.experiment.labels)) @@ -480,11 +473,8 @@ pre { def GetReport(self): chart_javascript = '' charts = self._GetCharts(self.labels, self.benchmark_runs) - for chart in charts: - chart_javascript += chart.GetJavascript() - chart_divs = '' - for chart in charts: - chart_divs += chart.GetDiv() + chart_javascript = ''.join(chart.GetJavascript() for chart in charts) + chart_divs = ''.join(chart.GetDiv() for chart in charts) summary_table = self.GetSummaryTables() full_table = self.GetFullTables() @@ -512,8 +502,7 @@ pre { charts = [] ro = ResultOrganizer(benchmark_runs, labels) result = ro.result - for item in result: - runs = result[item] + for item, runs in result.iteritems(): tg = TableGenerator(runs, ro.labels) table = tg.GetTable() columns = [Column(AmeanResult(), Format()), Column(MinResult(), Format()), -- cgit v1.2.3