diff options
author | Yunlian Jiang <yunlian@google.com> | 2015-12-17 09:11:57 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2015-12-17 19:14:02 +0000 |
commit | f16faa3c13aad409ebdfea30c2ae6a1a03c57ffb (patch) | |
tree | 622cb9173c5de4a1d520a934c1149fc657d8e115 | |
parent | 8d818fb82f1c2ba4ee0277e85dba919fa1d19586 (diff) | |
download | toolchain-utils-f16faa3c13aad409ebdfea30c2ae6a1a03c57ffb.tar.gz |
crosperf: fix lint warnings.
BUG=chromium:570454
TEST=crosperf_unittest.py is lint clean.
Change-Id: Ie33b95ec0cda61749b021e863ee65a47b491bb48
Reviewed-on: https://chrome-internal-review.googlesource.com/242520
Commit-Ready: Yunlian Jiang <yunlian@google.com>
Tested-by: Yunlian Jiang <yunlian@google.com>
Reviewed-by: Caroline Tice <cmtice@google.com>
-rwxr-xr-x | crosperf/crosperf_unittest.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/crosperf/crosperf_unittest.py b/crosperf/crosperf_unittest.py index 42a78ef8..5dd0e09f 100755 --- a/crosperf/crosperf_unittest.py +++ b/crosperf/crosperf_unittest.py @@ -1,25 +1,21 @@ -#!/usr/bin/python +#!/usr/bin/python2 # # Copyright 2014 Google Inc. All Rights Reserved. """Unittest for crosperf.""" -import atexit -import os + +from __future__ import print_function + import optparse import StringIO -import mock import unittest import crosperf import settings_factory import experiment_file -import experiment_runner from help import Help -from cros_utils import command_executer -from cros_utils import logger - EXPERIMENT_FILE_1 = """ board: x86-alex remote: chromeos-alex3 @@ -40,6 +36,7 @@ EXPERIMENT_FILE_1 = """ class CrosperfTest(unittest.TestCase): + """Crosperf test class.""" def setUp(self): input_file = StringIO.StringIO(EXPERIMENT_FILE_1) @@ -56,10 +53,10 @@ class CrosperfTest(unittest.TestCase): dest='log_dir', default='', help='The log_dir, default is under <crosperf_logs>/logs') - options_before = parser._get_all_options() + options_before = parser.option_list self.assertEqual(len(options_before), 3) crosperf.SetupParserOptions(parser) - options_after = parser._get_all_options() + options_after = parser.option_list self.assertEqual(len(options_after), 29) def test_convert_options_to_settings(self): @@ -74,14 +71,14 @@ class CrosperfTest(unittest.TestCase): help='The log_dir, default is under <crosperf_logs>/logs') crosperf.SetupParserOptions(parser) argv = ['crosperf/crosperf.py', 'temp.exp', '--rerun=True'] - options, args = parser.parse_args(argv) + options, _ = parser.parse_args(argv) settings = crosperf.ConvertOptionsToSettings(options) self.assertIsNotNone(settings) self.assertIsInstance(settings, settings_factory.GlobalSettings) self.assertEqual(len(settings.fields), 25) self.assertTrue(settings.GetField('rerun')) argv = ['crosperf/crosperf.py', 'temp.exp'] - options, args = parser.parse_args(argv) + options, _ = parser.parse_args(argv) settings = crosperf.ConvertOptionsToSettings(options) self.assertFalse(settings.GetField('rerun')) |