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>

1 files changed, 5 insertions, 5 deletions

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), '']