aboutsummaryrefslogtreecommitdiff
path: root/crosperf/settings_unittest.py
diff options
context:
space:
mode:
authorCaroline Tice <cmtice@google.com>2017-04-06 17:16:05 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-04-08 19:40:20 -0700
commitf6ef4395fe1896ba68c80e52cb24763b0fcfe7f8 (patch)
tree7612123711db98f0746e56b66368d16b388192bd /crosperf/settings_unittest.py
parent8c18be1425c8a4ecfc059a7c637fc93f33edab1f (diff)
downloadtoolchain-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/settings_unittest.py')
-rwxr-xr-xcrosperf/settings_unittest.py26
1 files changed, 12 insertions, 14 deletions
diff --git a/crosperf/settings_unittest.py b/crosperf/settings_unittest.py
index f1062f0d..fea55c05 100755
--- a/crosperf/settings_unittest.py
+++ b/crosperf/settings_unittest.py
@@ -48,14 +48,12 @@ class TestSettings(unittest.TestCase):
'run the test.'))
self.assertEqual(len(self.settings.fields), 1)
# Adding the same field twice raises an exception.
- self.assertRaises(
- Exception,
- self.settings.AddField, (IntegerField(
- 'iterations',
- default=1,
- required=False,
- description='Number of iterations to run '
- 'the test.')))
+ self.assertRaises(Exception, self.settings.AddField, (IntegerField(
+ 'iterations',
+ default=1,
+ required=False,
+ description='Number of iterations to run '
+ 'the test.')))
res = self.settings.fields['iterations']
self.assertIsInstance(res, IntegerField)
self.assertEqual(res.Get(), 1)
@@ -116,10 +114,10 @@ class TestSettings(unittest.TestCase):
self.assertEqual(res, 5)
def test_inherit(self):
- parent_settings = settings_factory.SettingsFactory().GetSettings('global',
- 'global')
- label_settings = settings_factory.SettingsFactory().GetSettings('label',
- 'label')
+ parent_settings = settings_factory.SettingsFactory().GetSettings(
+ 'global', 'global')
+ label_settings = settings_factory.SettingsFactory().GetSettings(
+ 'label', 'label')
self.assertEqual(parent_settings.GetField('chromeos_root'), '')
self.assertEqual(label_settings.GetField('chromeos_root'), '')
self.assertIsNone(label_settings.parent)
@@ -140,8 +138,8 @@ class TestSettings(unittest.TestCase):
'list of email addresses to send '
'email to.'))
- global_settings = settings_factory.SettingsFactory().GetSettings('global',
- 'global')
+ global_settings = settings_factory.SettingsFactory().GetSettings(
+ 'global', 'global')
global_settings.SetField('email', 'john.doe@google.com', append=True)
global_settings.SetField('email', 'jane.smith@google.com', append=True)