Fix indentation for python_lint

Author: gwynne

benchmark/scripts/test_Benchmark_Driver.py

@@ -101,7 +101,7 @@ def test_optimization_argument(self):
     def test_independent_samples(self):
         self.assertEqual(parse_args(['run']).independent_samples, 1)
         self.assertEqual(parse_args(['run', '-i', '3']).independent_samples,
-                          3)
+                         3)
         with captured_output() as (out, err):
             self.assertRaises(SystemExit,
                               parse_args, ['run', '-i', '-3'])
@@ -186,9 +186,9 @@ def test_gets_list_of_precommit_benchmarks(self):
             self.args, _subprocess=self.subprocess_mock)
         self.subprocess_mock.assert_called_all_expected()
         self.assertEqual(driver.tests,
-                          ['Benchmark1', 'Benchmark2'])
+                         ['Benchmark1', 'Benchmark2'])
         self.assertEqual(driver.all_tests,
-                          ['Benchmark1', 'Benchmark2'])
+                         ['Benchmark1', 'Benchmark2'])
         self.assertEquals(driver.test_number['Benchmark1'], "1")
         self.assertEquals(driver.test_number['Benchmark2'], "2")
 
@@ -209,7 +209,7 @@ def test_gets_list_of_all_benchmarks_when_benchmarks_args_exist(self):
         self.subprocess_mock.assert_called_all_expected()
         self.assertEqual(driver.tests, ['Benchmark1', 'Benchmark3'])
         self.assertEqual(driver.all_tests,
-                          ['Benchmark1', 'Benchmark2', 'Benchmark3'])
+                         ['Benchmark1', 'Benchmark2', 'Benchmark3'])
 
     def test_filters_benchmarks_by_pattern(self):
         self.args.filters = '-f .+3'.split()
@@ -219,7 +219,7 @@ def test_filters_benchmarks_by_pattern(self):
         self.subprocess_mock.assert_called_all_expected()
         self.assertEqual(driver.tests, ['Benchmark3'])
         self.assertEqual(driver.all_tests,
-                          ['Benchmark1', 'Benchmark2', 'Benchmark3'])
+                         ['Benchmark1', 'Benchmark2', 'Benchmark3'])
 
     def test_log_file(self):
         """When swift-repo is set, log is tied to Git branch and revision."""
@@ -231,7 +231,7 @@ def test_log_file(self):
             Stub(output_dir='/path', tests='/bin/', optimization='Suffix',
                  swift_repo=None,), tests=['ignored'])
         self.assertEqual(driver.log_file,
-                          '/path/Benchmark_Suffix-' + now + '.log')
+                         '/path/Benchmark_Suffix-' + now + '.log')
 
         r = '/repo/'
         subprocess_mock = SubprocessMock(responses=[
@@ -244,7 +244,7 @@ def test_log_file(self):
             Stub(output_dir='/log/', tests='', optimization='S', swift_repo=r),
             tests=['ignored'], _subprocess=subprocess_mock)
         self.assertEqual(driver.log_file,
-                          '/log/branch/Benchmark_S-' + now + '-short_hash.log')
+                         '/log/branch/Benchmark_S-' + now + '-short_hash.log')
         subprocess_mock.assert_called_all_expected()
 
 
@@ -377,7 +377,7 @@ def test_log_results(self):
         """Create log directory if it doesn't exist and write the log file."""
         def assert_log_written(out, log_file, content):
             self.assertEqual(out.getvalue(),
-                              'Logging results to: ' + log_file + '\n')
+                             'Logging results to: ' + log_file + '\n')
             with open(log_file, 'rU') as f:
                 text = f.read()
             self.assertEqual(text, "formatted output")
@@ -446,15 +446,15 @@ def record(level, level_name):
                 'levelname': level_name, 'msg': 'Hi!'})
         f = LoggingReportFormatter(use_color=True)
         self.assertEqual(f.format(record(logging.DEBUG, 'DEBUG')),
-                          '\x1b[1;39mcategory: Hi!\x1b[1;0m')
+                         '\x1b[1;39mcategory: Hi!\x1b[1;0m')
         self.assertEqual(f.format(record(logging.INFO, 'INFO')),
-                          '\x1b[1;32mcategory: Hi!\x1b[1;0m')
+                         '\x1b[1;32mcategory: Hi!\x1b[1;0m')
         self.assertEqual(f.format(record(logging.WARNING, 'WARNING')),
-                          '\x1b[1;33mcategory: Hi!\x1b[1;0m')
+                         '\x1b[1;33mcategory: Hi!\x1b[1;0m')
         self.assertEqual(f.format(record(logging.ERROR, 'ERROR')),
-                          '\x1b[1;31mcategory: Hi!\x1b[1;0m')
+                         '\x1b[1;31mcategory: Hi!\x1b[1;0m')
         self.assertEqual(f.format(record(logging.CRITICAL, 'CRITICAL')),
-                          '\x1b[1;35mcategory: Hi!\x1b[1;0m')
+                         '\x1b[1;35mcategory: Hi!\x1b[1;0m')
 
     def test_no_prefix_for_base_logging(self):
         lr = logging.makeLogRecord({

benchmark/scripts/test_compare_perf_tests.py

@@ -211,13 +211,13 @@ def test_init_quantiles(self):
         self.assertEqual(r.test_num, '1')
         self.assertEqual(r.name, 'Ackermann')
         self.assertEqual((r.num_samples, r.min, r.median, r.max),
-                          (3, 54383, 54512, 54601))
+                         (3, 54383, 54512, 54601))
         self.assertAlmostEquals(r.mean, 54498.67, places=2)
         self.assertAlmostEquals(r.sd, 109.61, places=2)
         self.assertEqual(r.samples.count, 3)
         self.assertEqual(r.samples.num_samples, 3)
         self.assertEqual([s.runtime for s in r.samples.all_samples],
-                          [54383, 54512, 54601])
+                         [54383, 54512, 54601])
 
         # #,TEST,SAMPLES,MIN(μs),MEDIAN(μs),MAX(μs),MAX_RSS(B)
         log = '1,Ackermann,3,54529,54760,55807,266240'
@@ -227,7 +227,7 @@ def test_init_quantiles(self):
         log = '1,Ackermann,5,54570,54593,54644,57212,58304'
         r = PerformanceTestResult(log.split(','), quantiles=True, memory=False)
         self.assertEqual((r.num_samples, r.min, r.median, r.max),
-                          (5, 54570, 54644, 58304))
+                         (5, 54570, 54644, 58304))
         self.assertEqual((r.samples.q1, r.samples.q3), (54593, 57212))
         self.assertEqual(r.samples.count, 5)
         # #,TEST,SAMPLES,MIN(μs),Q1(μs),Q2(μs),Q3(μs),MAX(μs),MAX_RSS(B)
@@ -244,7 +244,7 @@ def test_init_delta_quantiles(self):
         log = '202,DropWhileArray,2,265,,22'
         r = PerformanceTestResult(log.split(','), quantiles=True, delta=True)
         self.assertEqual((r.num_samples, r.min, r.median, r.max),
-                          (2, 265, 265, 287))
+                         (2, 265, 265, 287))
         self.assertEqual(r.samples.count, 2)
         self.assertEqual(r.samples.num_samples, 2)
 
@@ -267,7 +267,7 @@ def validatePTR(deq):  # construct from delta encoded quantiles string
                                       quantiles=True, delta=True)
             self.assertEqual(r.samples.num_samples, num_samples)
             self.assertEqual([s.runtime for s in r.samples.all_samples],
-                              range(1, num_samples + 1))
+                             range(1, num_samples + 1))
 
         delta_encoded_quantiles = """
 1,,
@@ -334,16 +334,16 @@ def as_tuple(r):
 
         r = results[0]
         self.assertEqual(as_tuple(r),
-                          (1, 12045, 12045, 12045, 0, 12045, None, None))
+                         (1, 12045, 12045, 12045, 0, 12045, None, None))
         r.merge(results[1])
         self.assertEqual(as_tuple(r),  # drops SD and median, +max_rss
-                          (2, 12045, 12325, 12185, None, None, 10510336, None))
+                         (2, 12045, 12325, 12185, None, None, 10510336, None))
         r.merge(results[2])
         self.assertEqual(as_tuple(r),  # picks smaller of the MAX_RSS, +setup
-                          (3, 11616, 12325, 11995.33, None, None, 10502144, 9))
+                         (3, 11616, 12325, 11995.33, None, None, 10502144, 9))
         r.merge(results[3])
         self.assertEqual(as_tuple(r),  # picks smaller of the setup values
-                          (4, 11616, 12325, 12064, None, None, 10498048, 7))
+                         (4, 11616, 12325, 12064, None, None, 10498048, 7))
 
 
 class TestResultComparison(unittest.TestCase):
@@ -482,12 +482,12 @@ def test_parse_quantiles(self):
             """#,TEST,SAMPLES,MIN(μs),MEDIAN(μs),MAX(μs)
 1,Ackermann,3,54383,54512,54601""")['Ackermann']
         self.assertEqual([s.runtime for s in r.samples.all_samples],
-                          [54383, 54512, 54601])
+                         [54383, 54512, 54601])
         r = LogParser.results_from_string(
             """#,TEST,SAMPLES,MIN(μs),MEDIAN(μs),MAX(μs),MAX_RSS(B)
 1,Ackermann,3,54529,54760,55807,266240""")['Ackermann']
         self.assertEqual([s.runtime for s in r.samples.all_samples],
-                          [54529, 54760, 55807])
+                         [54529, 54760, 55807])
         self.assertEqual(r.max_rss, 266240)
 
     def test_parse_delta_quantiles(self):
@@ -544,7 +544,7 @@ def test_parse_results_verbose(self):
         )
         self.assertEqual(r.num_samples, r.samples.num_samples)
         self.assertEqual(results[0].samples.all_samples,
-                          [(0, 78, 11812), (1, 90, 13898), (2, 90, 11467)])
+                         [(0, 78, 11812), (1, 90, 13898), (2, 90, 11467)])
         self.assertEqual(r.yields, None)
 
         r = results[1]
@@ -555,7 +555,7 @@ def test_parse_results_verbose(self):
         self.assertEqual(r.setup, 14444)
         self.assertEqual(r.num_samples, r.samples.num_samples)
         self.assertEqual(results[1].samples.all_samples,
-                          [(0, 1, 369900), (1, 1, 381039), (2, 1, 371043)])
+                         [(0, 1, 369900), (1, 1, 381039), (2, 1, 371043)])
         yielded = r.yields[0]
         self.assertEqual(yielded.before_sample, 1)
         self.assertEqual(yielded.after, 369918)
@@ -901,8 +901,8 @@ def test_delta_threshold_argument(self):
     def test_output_argument(self):
         self.assertEqual(parse_args(self.required).output, None)
         self.assertEqual(parse_args(self.required +
-                                     ['--output', 'report.log']).output,
-                          'report.log')
+                                    ['--output', 'report.log']).output,
+                         'report.log')
 
     def test_changes_only_argument(self):
         self.assertFalse(parse_args(self.required).changes_only)