crosperf: Ignore error when disabling turbo.

Some boards do not permit changing tubo config
/sys/devices/system/cpu/intel_pstate/no_turbo
Ignore the error for now so that tests can continue.

Also update some formatting suggested by tc_format.

BUG=chromium:839125
TEST=No more errors.

Change-Id: I3a709ea2638d783dd3a3ebf70eba8a6dbc4df53a
Reviewed-on: https://chromium-review.googlesource.com/1040773
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Trybot-Ready: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Luis Lozano <llozano@chromium.org>

2 files changed, 16 insertions, 15 deletions

diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py
index c7acea85..6a7fa6bd 100644
--- a/crosperf/suite_runner.py
+++ b/crosperf/suite_runner.py
@@ -74,8 +74,8 @@ class SuiteRunner(object):
         self.logger.LogOutput('benchmark %s failed. Retries left: %s' %
                               (benchmark.name, benchmark.retries - i))
       elif i > 0:
-        self.logger.LogOutput('benchmark %s succeded after %s retries' %
-                              (benchmark.name, i))
+        self.logger.LogOutput(
+            'benchmark %s succeded after %s retries' % (benchmark.name, i))
         break
       else:
         self.logger.LogOutput(
@@ -90,7 +90,7 @@ class SuiteRunner(object):
         'set -e && '
         # Disable Turbo in Intel pstate driver
         'if [[ -e /sys/devices/system/cpu/intel_pstate/no_turbo ]]; then '
-        'echo -n 1 > /sys/devices/system/cpu/intel_pstate/no_turbo; fi; '
+        '(echo -n 1 > /sys/devices/system/cpu/intel_pstate/no_turbo || true); fi; '
         # Set governor to performance for each cpu
         'for f in /sys/devices/system/cpu/cpu*/cpufreq; do '
         'cd $f; '
@@ -125,15 +125,15 @@ class SuiteRunner(object):
     FILE = '/usr/local/telemetry/src/tools/perf/page_sets/page_cycler_story.py'
     ret = self._ce.CrosRunCommand(
         'ls ' + FILE, machine=machine_name, chromeos_root=chromeos_root)
-    self.logger.LogFatalIf(ret, 'Could not find {} on machine: {}'.format(
-        FILE, machine_name))
+    self.logger.LogFatalIf(
+        ret, 'Could not find {} on machine: {}'.format(FILE, machine_name))
 
     if not ret:
       sed_command = 'sed -i "s/_TTI_WAIT_TIME = 10/_TTI_WAIT_TIME = 2/g" '
       ret = self._ce.CrosRunCommand(
           sed_command + FILE, machine=machine_name, chromeos_root=chromeos_root)
-      self.logger.LogFatalIf(ret, 'Could not modify {} on machine: {}'.format(
-          FILE, machine_name))
+      self.logger.LogFatalIf(
+          ret, 'Could not modify {} on machine: {}'.format(FILE, machine_name))
 
   def RestartUI(self, machine_name, chromeos_root):
     command = 'stop ui; sleep 5; start ui'
diff --git a/crosperf/suite_runner_unittest.py b/crosperf/suite_runner_unittest.py
index 5500c389..ed18eb7a 100755
--- a/crosperf/suite_runner_unittest.py
+++ b/crosperf/suite_runner_unittest.py
@@ -134,9 +134,9 @@ class SuiteRunnerTest(unittest.TestCase):
     self.assertTrue(self.call_telemetry_run)
     self.assertFalse(self.call_test_that_run)
     self.assertFalse(self.call_telemetry_crosperf_run)
-    self.assertEqual(self.telemetry_run_args, [
-        'fake_machine', self.mock_label, self.telemetry_bench, ''
-    ])
+    self.assertEqual(
+        self.telemetry_run_args,
+        ['fake_machine', self.mock_label, self.telemetry_bench, ''])
 
     reset()
     self.runner.Run(machine, self.mock_label, self.test_that_bench, test_args,
@@ -145,9 +145,9 @@ class SuiteRunnerTest(unittest.TestCase):
     self.assertFalse(self.call_telemetry_run)
     self.assertTrue(self.call_test_that_run)
     self.assertFalse(self.call_telemetry_crosperf_run)
-    self.assertEqual(self.test_that_args, [
-        'fake_machine', self.mock_label, self.test_that_bench, '', ''
-    ])
+    self.assertEqual(
+        self.test_that_args,
+        ['fake_machine', self.mock_label, self.test_that_bench, '', ''])
 
     reset()
     self.runner.Run(machine, self.mock_label, self.telemetry_crosperf_bench,
@@ -171,7 +171,7 @@ class SuiteRunnerTest(unittest.TestCase):
         'set -e && '
         # Disable Turbo in Intel pstate driver
         'if [[ -e /sys/devices/system/cpu/intel_pstate/no_turbo ]]; then '
-        'echo -n 1 > /sys/devices/system/cpu/intel_pstate/no_turbo; fi; '
+        '(echo -n 1 > /sys/devices/system/cpu/intel_pstate/no_turbo || true); fi; '
         # Set governor to performance for each cpu
         'for f in /sys/devices/system/cpu/cpu*/cpufreq; do '
         'cd $f; '
@@ -193,7 +193,8 @@ class SuiteRunnerTest(unittest.TestCase):
     self.runner.PinGovernorExecutionFrequencies = FakePinGovernor
     self.runner.RestartUI('lumpy1.cros', '/tmp/chromeos')
     self.assertEqual(mock_cros_runcmd.call_count, 1)
-    self.assertEqual(mock_cros_runcmd.call_args_list[0][0], ('stop ui; sleep 5; start ui',))
+    self.assertEqual(mock_cros_runcmd.call_args_list[0][0],
+                     ('stop ui; sleep 5; start ui',))
 
   @mock.patch.object(command_executer.CommandExecuter, 'CrosRunCommand')
   @mock.patch.object(command_executer.CommandExecuter,