Fix unittests that recent changes broke.

BUG=chromium:570522
TEST=Tested in my directory.

Change-Id: I197f5f5be3399babc838f4345173625e4d5bd91c
Reviewed-on: https://chrome-internal-review.googlesource.com/242565
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Luis Lozano <llozano@chromium.org>

3 files changed, 13 insertions, 12 deletions

diff --git a/crosperf/experiment_runner_unittest.py b/crosperf/experiment_runner_unittest.py
index f665587e..811fed13 100755
--- a/crosperf/experiment_runner_unittest.py
+++ b/crosperf/experiment_runner_unittest.py
@@ -283,7 +283,7 @@ class ExperimentRunnerTest(unittest.TestCase):
     self.assertEqual(mock_html_report.call_count, 1)
     self.assertEqual(len(mock_emailer.call_args), 2)
     self.assertEqual(mock_emailer.call_args[0],
-                     (['john.smith@google.com', 'jane.doe@google.com'],
+                     (['jane.doe@google.com', 'john.smith@google.com'],
                       ': image1 vs. image2',
                       "<pre style='font-size: 13px'>This is a fake text "
                       'report.\nResults are stored in _results.\n</pre>'))
@@ -313,7 +313,8 @@ class ExperimentRunnerTest(unittest.TestCase):
     self.assertEqual(mock_html_report.call_count, 1)
     self.assertEqual(len(mock_emailer.call_args), 2)
     self.assertEqual(mock_emailer.call_args[0],
-                     (['john.smith@google.com', 'jane.doe@google.com'],
+                     (['jane.doe@google.com', 'john.smith@google.com',
+                       'john.smith@google.com'],
                       ': image1 vs. image2',
                       "<pre style='font-size: 13px'>This is a fake text "
                       'report.\nResults are stored in _results.\n</pre>'))
diff --git a/crosperf/machine_manager_unittest.py b/crosperf/machine_manager_unittest.py
index abbbaff7..4bfd177e 100755
--- a/crosperf/machine_manager_unittest.py
+++ b/crosperf/machine_manager_unittest.py
@@ -239,7 +239,7 @@ class MachineManagerTest(unittest.TestCase):
     self.assertRaises(self.mm._TryToLockMachine, None)
 
     mock_cros_runcmd.return_value = [0, 'false_lock_checksum', '']
-    self.mock_cmd_exec.CrosRunCommand = mock_cros_runcmd
+    self.mock_cmd_exec.CrosRunCommandWOutput = mock_cros_runcmd
     self.mm._machines = []
     self.mm._TryToLockMachine(self.mock_lumpy1)
     self.assertEqual(len(self.mm._machines), 1)
@@ -747,7 +747,7 @@ class CrosMachineTest(unittest.TestCase):
   def test_get_memory_info(self, mock_setup, mock_run_cmd):
     cm = machine_manager.CrosMachine('daisy.cros', '/usr/local/chromeos',
                                      'average', self.mock_cmd_exec)
-    self.mock_cmd_exec.CrosRunCommand = mock_run_cmd
+    self.mock_cmd_exec.CrosRunCommandWOutput = mock_run_cmd
     mock_run_cmd.return_value = [0, MEMINFO_STRING, '']
     cm._GetMemoryInfo()
     self.assertEqual(mock_run_cmd.call_count, 1)
@@ -767,7 +767,7 @@ class CrosMachineTest(unittest.TestCase):
   def test_get_cpu_info(self, mock_setup, mock_run_cmd):
     cm = machine_manager.CrosMachine('daisy.cros', '/usr/local/chromeos',
                                      'average', self.mock_cmd_exec)
-    self.mock_cmd_exec.CrosRunCommand = mock_run_cmd
+    self.mock_cmd_exec.CrosRunCommandWOutput = mock_run_cmd
     mock_run_cmd.return_value = [0, CPUINFO_STRING, '']
     cm._GetCPUInfo()
     self.assertEqual(mock_run_cmd.call_count, 1)
@@ -800,12 +800,12 @@ class CrosMachineTest(unittest.TestCase):
     checksum_str = cm._GetMD5Checksum(temp_str)
     self.assertEqual(checksum_str, '')
 
-  @mock.patch.object(command_executer.CommandExecuter, 'CrosRunCommand')
+  @mock.patch.object(command_executer.CommandExecuter, 'CrosRunCommandWOutput')
   @mock.patch.object(machine_manager.CrosMachine, 'SetUpChecksumInfo')
   def test_get_machine_id(self, mock_setup, mock_run_cmd):
     cm = machine_manager.CrosMachine('daisy.cros', '/usr/local/chromeos',
                                      'average', self.mock_cmd_exec)
-    self.mock_cmd_exec.CrosRunCommand = mock_run_cmd
+    self.mock_cmd_exec.CrosRunCommandWOutput = mock_run_cmd
     mock_run_cmd.return_value = [0, DUMP_VPD_STRING, '']
 
     cm._GetMachineID()
diff --git a/crosperf/results_cache_unittest.py b/crosperf/results_cache_unittest.py
index 11746db7..73f62292 100755
--- a/crosperf/results_cache_unittest.py
+++ b/crosperf/results_cache_unittest.py
@@ -363,7 +363,7 @@ class ResultTest(unittest.TestCase):
   @mock.patch.object(misc, 'GetInsideChrootPath')
   @mock.patch.object(tempfile, 'mkdtemp')
   @mock.patch.object(command_executer.CommandExecuter, 'RunCommand')
-  @mock.patch.object(command_executer.CommandExecuter, 'ChrootRunCommand')
+  @mock.patch.object(command_executer.CommandExecuter, 'ChrootRunCommandWOutput')
   def test_get_keyvals(self, mock_chrootruncmd, mock_runcmd, mock_mkdtemp,
                        mock_getpath):
 
@@ -390,7 +390,7 @@ class ResultTest(unittest.TestCase):
                                       ('%s,PASS\n%s/telemetry_Crosperf,PASS\n')
                                       % (TMP_DIR1, TMP_DIR1), '']
     mock_getpath.return_value = TMP_DIR1
-    self.result._ce.ChrootRunCommand = mock_chrootruncmd
+    self.result._ce.ChrootRunCommandWOutput = mock_chrootruncmd
     self.result._ce.RunCommand = mock_runcmd
     self.result._GetNewKeyvals = FakeGetNewKeyvals
     self.result.suite = 'telemetry_Crosperf'
@@ -444,7 +444,7 @@ class ResultTest(unittest.TestCase):
     resdir = self.result._GetResultsDir()
     self.assertEqual(resdir, '/tmp/test_that.PO1234567/platform_LibCBench')
 
-  @mock.patch.object(command_executer.CommandExecuter, 'RunCommand')
+  @mock.patch.object(command_executer.CommandExecuter, 'RunCommandGeneric')
   def test_find_files_in_results_dir(self, mock_runcmd):
 
     self.result.results_dir = None
@@ -584,7 +584,7 @@ class ResultTest(unittest.TestCase):
     self.assertEqual(self.result.keyvals, {'Total': 10, 'retval': 1})
 
   @mock.patch.object(misc, 'GetInsideChrootPath')
-  @mock.patch.object(command_executer.CommandExecuter, 'ChrootRunCommand')
+  @mock.patch.object(command_executer.CommandExecuter, 'ChrootRunCommandWOutput')
   def test_populate_from_cache_dir(self, mock_runchrootcmd, mock_getpath):
 
     def FakeMkdtemp(dir=''):
@@ -593,7 +593,7 @@ class ResultTest(unittest.TestCase):
     current_path = os.getcwd()
     cache_dir = os.path.join(current_path, 'test_cache/test_input')
     self.result._ce = command_executer.GetCommandExecuter(log_level='average')
-    self.result._ce.ChrootRunCommand = mock_runchrootcmd
+    self.result._ce.ChrootRunCommandWOutput = mock_runchrootcmd
     mock_runchrootcmd.return_value = ['',
                                       ('%s,PASS\n%s/\telemetry_Crosperf,PASS\n')
                                       % (TMP_DIR1, TMP_DIR1), '']