diff options
author | Caroline Tice <cmtice@google.com> | 2017-04-06 17:16:05 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-04-08 19:40:20 -0700 |
commit | f6ef4395fe1896ba68c80e52cb24763b0fcfe7f8 (patch) | |
tree | 7612123711db98f0746e56b66368d16b388192bd /crosperf/benchmark_run_unittest.py | |
parent | 8c18be1425c8a4ecfc059a7c637fc93f33edab1f (diff) | |
download | toolchain-utils-f6ef4395fe1896ba68c80e52cb24763b0fcfe7f8.tar.gz |
[toolchain-utils] Fix remaining lint errors in toolchain-utils.
In addition to fixing the lint errors, this also fixes the Python
formatting issues (ran tc_pyformat on nearly all the files).
BUG=chromium:570450
TEST=Ran all crosperf & bisect tool unit tests.
Ran afe_lock_machine.py (check machine status)
Ran full crosperf test (octane, speedometer, BootPerf) on alex.
Change-Id: Ic86f9192801ac67769f3de30f1c5f0d203ce0831
Reviewed-on: https://chromium-review.googlesource.com/471886
Commit-Ready: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Diffstat (limited to 'crosperf/benchmark_run_unittest.py')
-rwxr-xr-x | crosperf/benchmark_run_unittest.py | 76 |
1 files changed, 34 insertions, 42 deletions
diff --git a/crosperf/benchmark_run_unittest.py b/crosperf/benchmark_run_unittest.py index 9af66a33..74757ac2 100755 --- a/crosperf/benchmark_run_unittest.py +++ b/crosperf/benchmark_run_unittest.py @@ -117,11 +117,10 @@ class BenchmarkRunTest(unittest.TestCase): pass def test_run(self): - br = benchmark_run.BenchmarkRun('test_run', self.test_benchmark, - self.test_label, 1, - self.test_cache_conditions, - self.mock_machine_manager, self.mock_logger, - 'average', '') + br = benchmark_run.BenchmarkRun( + 'test_run', self.test_benchmark, self.test_label, 1, + self.test_cache_conditions, self.mock_machine_manager, self.mock_logger, + 'average', '') def MockLogOutput(msg, print_to_console=False): 'Helper function for test_run.' @@ -258,11 +257,10 @@ class BenchmarkRunTest(unittest.TestCase): self.assertEqual(self.status, ['FAILED']) def test_terminate_pass(self): - br = benchmark_run.BenchmarkRun('test_run', self.test_benchmark, - self.test_label, 1, - self.test_cache_conditions, - self.mock_machine_manager, self.mock_logger, - 'average', '') + br = benchmark_run.BenchmarkRun( + 'test_run', self.test_benchmark, self.test_label, 1, + self.test_cache_conditions, self.mock_machine_manager, self.mock_logger, + 'average', '') def GetLastEventPassed(): 'Helper function for test_terminate_pass' @@ -286,11 +284,10 @@ class BenchmarkRunTest(unittest.TestCase): self.assertEqual(self.status, benchmark_run.STATUS_FAILED) def test_terminate_fail(self): - br = benchmark_run.BenchmarkRun('test_run', self.test_benchmark, - self.test_label, 1, - self.test_cache_conditions, - self.mock_machine_manager, self.mock_logger, - 'average', '') + br = benchmark_run.BenchmarkRun( + 'test_run', self.test_benchmark, self.test_label, 1, + self.test_cache_conditions, self.mock_machine_manager, self.mock_logger, + 'average', '') def GetLastEventFailed(): 'Helper function for test_terminate_fail' @@ -314,11 +311,10 @@ class BenchmarkRunTest(unittest.TestCase): self.assertEqual(self.status, benchmark_run.STATUS_SUCCEEDED) def test_acquire_machine(self): - br = benchmark_run.BenchmarkRun('test_run', self.test_benchmark, - self.test_label, 1, - self.test_cache_conditions, - self.mock_machine_manager, self.mock_logger, - 'average', '') + br = benchmark_run.BenchmarkRun( + 'test_run', self.test_benchmark, self.test_label, 1, + self.test_cache_conditions, self.mock_machine_manager, self.mock_logger, + 'average', '') br.terminated = True self.assertRaises(Exception, br.AcquireMachine) @@ -332,11 +328,10 @@ class BenchmarkRunTest(unittest.TestCase): self.assertEqual(machine.name, 'chromeos1-row3-rack5-host7.cros') def test_get_extra_autotest_args(self): - br = benchmark_run.BenchmarkRun('test_run', self.test_benchmark, - self.test_label, 1, - self.test_cache_conditions, - self.mock_machine_manager, self.mock_logger, - 'average', '') + br = benchmark_run.BenchmarkRun( + 'test_run', self.test_benchmark, self.test_label, 1, + self.test_cache_conditions, self.mock_machine_manager, self.mock_logger, + 'average', '') def MockLogError(err_msg): 'Helper function for test_get_extra_autotest_args' @@ -372,11 +367,10 @@ class BenchmarkRunTest(unittest.TestCase): @mock.patch.object(SuiteRunner, 'Run') @mock.patch.object(Result, 'CreateFromRun') def test_run_test(self, mock_result, mock_runner): - br = benchmark_run.BenchmarkRun('test_run', self.test_benchmark, - self.test_label, 1, - self.test_cache_conditions, - self.mock_machine_manager, self.mock_logger, - 'average', '') + br = benchmark_run.BenchmarkRun( + 'test_run', self.test_benchmark, self.test_label, 1, + self.test_cache_conditions, self.mock_machine_manager, self.mock_logger, + 'average', '') self.status = [] @@ -391,9 +385,9 @@ class BenchmarkRunTest(unittest.TestCase): br.RunTest(mock_machine) self.assertTrue(br.run_completed) - self.assertEqual( - self.status, - [benchmark_run.STATUS_IMAGING, benchmark_run.STATUS_RUNNING]) + self.assertEqual(self.status, [ + benchmark_run.STATUS_IMAGING, benchmark_run.STATUS_RUNNING + ]) self.assertEqual(br.machine_manager.ImageMachine.call_count, 1) br.machine_manager.ImageMachine.assert_called_with(mock_machine, @@ -403,17 +397,15 @@ class BenchmarkRunTest(unittest.TestCase): '', br.profiler_args) self.assertEqual(mock_result.call_count, 1) - mock_result.assert_called_with(self.mock_logger, 'average', self.test_label, - None, "{'Score':100}", '', 0, - 'page_cycler.netsim.top_10', - 'telemetry_Crosperf') + mock_result.assert_called_with( + self.mock_logger, 'average', self.test_label, None, "{'Score':100}", '', + 0, 'page_cycler.netsim.top_10', 'telemetry_Crosperf') def test_set_cache_conditions(self): - br = benchmark_run.BenchmarkRun('test_run', self.test_benchmark, - self.test_label, 1, - self.test_cache_conditions, - self.mock_machine_manager, self.mock_logger, - 'average', '') + br = benchmark_run.BenchmarkRun( + 'test_run', self.test_benchmark, self.test_label, 1, + self.test_cache_conditions, self.mock_machine_manager, self.mock_logger, + 'average', '') phony_cache_conditions = [123, 456, True, False] |