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, 29 insertions, 25 deletions

diff --git a/crosperf/benchmark_unittest.py b/crosperf/benchmark_unittest.py
index 320ede65..24c364c0 100755
--- a/crosperf/benchmark_unittest.py
+++ b/crosperf/benchmark_unittest.py
@@ -16,43 +16,47 @@ class BenchmarkTestCase(unittest.TestCase):
 
   def test_benchmark(self):
     # Test creating a benchmark with all the fields filled out.
-    b1 = Benchmark('b1_test',  # name
-                   'octane',  # test_name
-                   '',  # test_args
-                   3,  # iterations
-                   False,  # rm_chroot_tmp
-                   'record -e cycles',  # perf_args
-                   'telemetry_Crosperf',  # suite
-                   True)  # show_all_results
+    b1 = Benchmark(
+        'b1_test',  # name
+        'octane',  # test_name
+        '',  # test_args
+        3,  # iterations
+        False,  # rm_chroot_tmp
+        'record -e cycles',  # perf_args
+        'telemetry_Crosperf',  # suite
+        True)  # show_all_results
     self.assertTrue(b1.suite, 'telemetry_Crosperf')
 
     # Test creating a benchmark field with default fields left out.
-    b2 = Benchmark('b2_test',  # name
-                   'octane',  # test_name
-                   '',  # test_args
-                   3,  # iterations
-                   False,  # rm_chroot_tmp
-                   'record -e cycles')  # perf_args
+    b2 = Benchmark(
+        'b2_test',  # name
+        'octane',  # test_name
+        '',  # test_args
+        3,  # iterations
+        False,  # rm_chroot_tmp
+        'record -e cycles')  # perf_args
     self.assertEqual(b2.suite, '')
     self.assertFalse(b2.show_all_results)
 
     # Test explicitly creating 'suite=Telemetry' and 'show_all_results=False"
     # and see what happens.
-    b3 = Benchmark('b3_test',  # name
-                   'octane',  # test_name
-                   '',  # test_args
-                   3,  # iterations
-                   False,  # rm_chroot_tmp
-                   'record -e cycles',  # perf_args
-                   'telemetry',  # suite
-                   False)  # show_all_results
+    b3 = Benchmark(
+        'b3_test',  # name
+        'octane',  # test_name
+        '',  # test_args
+        3,  # iterations
+        False,  # rm_chroot_tmp
+        'record -e cycles',  # perf_args
+        'telemetry',  # suite
+        False)  # show_all_results
     self.assertTrue(b3.show_all_results)
 
     # Check to see if the args to Benchmark have changed since the last time
     # this test was updated.
-    args_list = ['self', 'name', 'test_name', 'test_args', 'iterations',
-                 'rm_chroot_tmp', 'perf_args', 'suite', 'show_all_results',
-                 'retries', 'run_local']
+    args_list = [
+        'self', 'name', 'test_name', 'test_args', 'iterations', 'rm_chroot_tmp',
+        'perf_args', 'suite', 'show_all_results', 'retries', 'run_local'
+    ]
     arg_spec = inspect.getargspec(Benchmark.__init__)
     self.assertEqual(len(arg_spec.args), len(args_list))
     for arg in args_list: