Merge branch 'aosp/mirror-chromium-master' into update_utils am: 4307f4735e am: 18caef1edd am: 6c551e0d52 am: ddfea1f7e7android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-dev

am: f1a93c225b

Change-Id: I60d258ddb8fd0bf9632f1f70c5cdeb3078938059

1 files changed, 84 insertions, 59 deletions

diff --git a/cros_utils/tabulator.py b/cros_utils/tabulator.py
index 98f126bc..6936d35f 100644
--- a/cros_utils/tabulator.py
+++ b/cros_utils/tabulator.py
@@ -57,7 +57,6 @@ table:
   cell_table = tf.GetCellTable()
   tp = TablePrinter(cell_table, out_to)
   print tp.Print()
-
 """
 
 from __future__ import print_function
@@ -464,12 +463,13 @@ class KeyAwareComparisonResult(ComparisonResult):
     # --texture_upload_count--texture_upload_count--count (high is good)
     # --total_deferred_image_decode_count--count (low is good)
     # --total_tiles_analyzed--total_tiles_analyzed--count (high is good)
-    lower_is_better_keys = ['milliseconds', 'ms_', 'seconds_', 'KB', 'rdbytes',
-                            'wrbytes', 'dropped_percent', '(ms)', '(seconds)',
-                            '--ms', '--average_num_missing_tiles',
-                            '--experimental_jank', '--experimental_mean_frame',
-                            '--experimental_median_frame_time',
-                            '--total_deferred_image_decode_count', '--seconds']
+    lower_is_better_keys = [
+        'milliseconds', 'ms_', 'seconds_', 'KB', 'rdbytes', 'wrbytes',
+        'dropped_percent', '(ms)', '(seconds)', '--ms',
+        '--average_num_missing_tiles', '--experimental_jank',
+        '--experimental_mean_frame', '--experimental_median_frame_time',
+        '--total_deferred_image_decode_count', '--seconds'
+    ]
 
     return any([l in key for l in lower_is_better_keys])
 
@@ -608,12 +608,13 @@ class PValueFormat(Format):
   def _ComputeFloat(self, cell):
     cell.string_value = '%0.2f' % float(cell.value)
     if float(cell.value) < 0.05:
-      cell.bgcolor = self._GetColor(cell.value,
-                                    Color(255, 255, 0, 0),
-                                    Color(255, 255, 255, 0),
-                                    Color(255, 255, 255, 0),
-                                    mid_value=0.05,
-                                    power=1)
+      cell.bgcolor = self._GetColor(
+          cell.value,
+          Color(255, 255, 0, 0),
+          Color(255, 255, 255, 0),
+          Color(255, 255, 255, 0),
+          mid_value=0.05,
+          power=1)
 
 
 class StorageFormat(Format):
@@ -647,12 +648,13 @@ class CoeffVarFormat(Format):
 
   def _ComputeFloat(self, cell):
     cell.string_value = '%1.1f%%' % (float(cell.value) * 100)
-    cell.color = self._GetColor(cell.value,
-                                Color(0, 255, 0, 0),
-                                Color(0, 0, 0, 0),
-                                Color(255, 0, 0, 0),
-                                mid_value=0.02,
-                                power=1)
+    cell.color = self._GetColor(
+        cell.value,
+        Color(0, 255, 0, 0),
+        Color(0, 0, 0, 0),
+        Color(255, 0, 0, 0),
+        mid_value=0.02,
+        power=1)
 
 
 class PercentFormat(Format):
@@ -664,7 +666,8 @@ class PercentFormat(Format):
 
   def _ComputeFloat(self, cell):
     cell.string_value = '%+1.1f%%' % ((float(cell.value) - 1) * 100)
-    cell.color = self._GetColor(cell.value, Color(255, 0, 0, 0),
+    cell.color = self._GetColor(cell.value,
+                                Color(255, 0, 0, 0),
                                 Color(0, 0, 0, 0), Color(0, 255, 0, 0))
 
 
@@ -677,7 +680,8 @@ class RatioFormat(Format):
 
   def _ComputeFloat(self, cell):
     cell.string_value = '%+1.1f%%' % ((cell.value - 1) * 100)
-    cell.color = self._GetColor(cell.value, Color(255, 0, 0, 0),
+    cell.color = self._GetColor(cell.value,
+                                Color(255, 0, 0, 0),
                                 Color(0, 0, 0, 0), Color(0, 255, 0, 0))
 
 
@@ -693,7 +697,8 @@ class ColorBoxFormat(Format):
 
   def _ComputeFloat(self, cell):
     cell.string_value = '--'
-    bgcolor = self._GetColor(cell.value, Color(255, 0, 0, 0),
+    bgcolor = self._GetColor(cell.value,
+                             Color(255, 0, 0, 0),
                              Color(255, 255, 255, 0), Color(0, 255, 0, 0))
     cell.bgcolor = bgcolor
     cell.color = bgcolor
@@ -889,8 +894,8 @@ class TableFormatter(object):
   def AddLabelName(self):
     """Put label on the top of the table."""
     top_header = []
-    base_colspan = len([c for c in self._columns if not c.result.NeedsBaseline()
-                       ])
+    base_colspan = len(
+        [c for c in self._columns if not c.result.NeedsBaseline()])
     compare_colspan = len(self._columns)
     # Find the row with the key 'retval', if it exists.  This
     # will be used to calculate the number of iterations that passed and
@@ -1179,14 +1184,17 @@ def GetComplexTable(runs, labels, out_to=TablePrinter.CONSOLE):
   """
   tg = TableGenerator(runs, labels, TableGenerator.SORT_BY_VALUES_DESC)
   table = tg.GetTable()
-  columns = [Column(LiteralResult(), Format(), 'Literal'),
-             Column(AmeanResult(), Format()), Column(StdResult(), Format()),
-             Column(CoeffVarResult(), CoeffVarFormat()),
-             Column(NonEmptyCountResult(), Format()),
-             Column(AmeanRatioResult(), PercentFormat()),
-             Column(AmeanRatioResult(), RatioFormat()),
-             Column(GmeanRatioResult(), RatioFormat()),
-             Column(PValueResult(), PValueFormat())]
+  columns = [
+      Column(LiteralResult(), Format(), 'Literal'), Column(
+          AmeanResult(), Format()), Column(StdResult(), Format()), Column(
+              CoeffVarResult(), CoeffVarFormat()), Column(
+                  NonEmptyCountResult(), Format()),
+      Column(AmeanRatioResult(), PercentFormat()), Column(
+          AmeanRatioResult(), RatioFormat()), Column(GmeanRatioResult(),
+                                                     RatioFormat()), Column(
+                                                         PValueResult(),
+                                                         PValueFormat())
+  ]
   tf = TableFormatter(table, columns)
   cell_table = tf.GetCellTable()
   tp = TablePrinter(cell_table, out_to)
@@ -1195,38 +1203,55 @@ def GetComplexTable(runs, labels, out_to=TablePrinter.CONSOLE):
 
 if __name__ == '__main__':
   # Run a few small tests here.
-  runs = [[{'k1': '10',
-            'k2': '12',
-            'k5': '40',
-            'k6': '40',
-            'ms_1': '20',
-            'k7': 'FAIL',
-            'k8': 'PASS',
-            'k9': 'PASS',
-            'k10': '0'}, {'k1': '13',
-                          'k2': '14',
-                          'k3': '15',
-                          'ms_1': '10',
-                          'k8': 'PASS',
-                          'k9': 'FAIL',
-                          'k10': '0'}], [{'k1': '50',
-                                          'k2': '51',
-                                          'k3': '52',
-                                          'k4': '53',
-                                          'k5': '35',
-                                          'k6': '45',
-                                          'ms_1': '200',
-                                          'ms_2': '20',
-                                          'k7': 'FAIL',
-                                          'k8': 'PASS',
-                                          'k9': 'PASS'}]]
+  runs = [[{
+      'k1': '10',
+      'k2': '12',
+      'k5': '40',
+      'k6': '40',
+      'ms_1': '20',
+      'k7': 'FAIL',
+      'k8': 'PASS',
+      'k9': 'PASS',
+      'k10': '0'
+  }, {
+      'k1': '13',
+      'k2': '14',
+      'k3': '15',
+      'ms_1': '10',
+      'k8': 'PASS',
+      'k9': 'FAIL',
+      'k10': '0'
+  }], [{
+      'k1': '50',
+      'k2': '51',
+      'k3': '52',
+      'k4': '53',
+      'k5': '35',
+      'k6': '45',
+      'ms_1': '200',
+      'ms_2': '20',
+      'k7': 'FAIL',
+      'k8': 'PASS',
+      'k9': 'PASS'
+  }]]
   labels = ['vanilla', 'modified']
   t = GetComplexTable(runs, labels, TablePrinter.CONSOLE)
   print(t)
   email = GetComplexTable(runs, labels, TablePrinter.EMAIL)
 
-  runs = [[{'k1': '1'}, {'k1': '1.1'}, {'k1': '1.2'}],
-          [{'k1': '5'}, {'k1': '5.1'}, {'k1': '5.2'}]]
+  runs = [[{
+      'k1': '1'
+  }, {
+      'k1': '1.1'
+  }, {
+      'k1': '1.2'
+  }], [{
+      'k1': '5'
+  }, {
+      'k1': '5.1'
+  }, {
+      'k1': '5.2'
+  }]]
   t = GetComplexTable(runs, labels, TablePrinter.CONSOLE)
   print(t)