crosperf: restart ui instead of reboot machine.

We restart machine to try to get a clean state for testing. But
the restart beeping is anoying, as a workaround, we restart ui
instead of reboot machine.

BUG=None
TEST=unittest passes.

Change-Id: Idec234e86af661213206f954eda1fb0967c74024
Reviewed-on: https://chromium-review.googlesource.com/953864
Commit-Ready: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>

3 files changed, 12 insertions, 16 deletions

diff --git a/crosperf/experiment_factory_unittest.py b/crosperf/experiment_factory_unittest.py
index 5f82ffec..b7d3420b 100755
--- a/crosperf/experiment_factory_unittest.py
+++ b/crosperf/experiment_factory_unittest.py
@@ -225,14 +225,14 @@ class ExperimentFactoryTest(unittest.TestCase):
     ef = ExperimentFactory()
     self.assertRaises(Exception, ef.GetDefaultRemotes, 'bad-board')
 
-    # Verify that we have entries for every board, and that we get three
-    # machines back for each board.
+    # Verify that we have entries for every board, and that we get at least
+    # two machines for each board.
     for b in board_list:
       remotes = ef.GetDefaultRemotes(b)
-      if b == 'elm':
-        self.assertEqual(len(remotes), 2)
+      if b == 'daisy':
+        self.assertEqual(len(remotes), 1)
       else:
-        self.assertEqual(len(remotes), 3)
+        self.assertGreaterEqual(len(remotes), 2)
 
 
 if __name__ == '__main__':
diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py
index bd27f282..c7acea85 100644
--- a/crosperf/suite_runner.py
+++ b/crosperf/suite_runner.py
@@ -135,13 +135,10 @@ class SuiteRunner(object):
       self.logger.LogFatalIf(ret, 'Could not modify {} on machine: {}'.format(
           FILE, machine_name))
 
-  def RebootMachine(self, machine_name, chromeos_root):
-    command = 'reboot && exit'
+  def RestartUI(self, machine_name, chromeos_root):
+    command = 'stop ui; sleep 5; start ui'
     self._ce.CrosRunCommand(
         command, machine=machine_name, chromeos_root=chromeos_root)
-    time.sleep(60)
-    # Whenever we reboot the machine, we need to restore the governor settings.
-    self.PinGovernorExecutionFrequencies(machine_name, chromeos_root)
 
   def Test_That_Run(self, machine, label, benchmark, test_args, profiler_args):
     """Run the test_that test.."""
@@ -158,7 +155,8 @@ class SuiteRunner(object):
 
     # We do this because some tests leave the machine in weird states.
     # Rebooting between iterations has proven to help with this.
-    self.RebootMachine(machine, label.chromeos_root)
+    # But the beep is anoying, we will try restart ui.
+    self.RestartUI(machine, label.chromeos_root)
 
     autotest_dir = AUTOTEST_DIR
     if label.autotest_path != '':
diff --git a/crosperf/suite_runner_unittest.py b/crosperf/suite_runner_unittest.py
index 78bdfbdf..5500c389 100755
--- a/crosperf/suite_runner_unittest.py
+++ b/crosperf/suite_runner_unittest.py
@@ -191,11 +191,9 @@ class SuiteRunnerTest(unittest.TestCase):
 
     self.mock_cmd_exec.CrosRunCommand = mock_cros_runcmd
     self.runner.PinGovernorExecutionFrequencies = FakePinGovernor
-    self.runner.RebootMachine('lumpy1.cros', '/tmp/chromeos')
+    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], ('reboot && exit',))
-    self.assertEqual(mock_sleep.call_count, 1)
-    self.assertEqual(mock_sleep.call_args_list[0][0], (60,))
+    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,
@@ -228,7 +226,7 @@ class SuiteRunnerTest(unittest.TestCase):
     self.mock_cmd_exec.CrosRunCommand = mock_cros_runcmd
     res = self.runner.Test_That_Run('lumpy1.cros', self.mock_label,
                                     self.test_that_bench, '--iterations=2', '')
-    self.assertEqual(mock_cros_runcmd.call_count, 1)
+    self.assertEqual(mock_cros_runcmd.call_count, 2)
     self.assertEqual(mock_chroot_runcmd.call_count, 1)
     self.assertEqual(res, 0)
     self.assertEqual(mock_cros_runcmd.call_args_list[0][0],