aboutsummaryrefslogtreecommitdiff
path: root/crosperf
diff options
context:
space:
mode:
authorcmtice <cmtice@google.com>2014-05-29 16:11:04 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-05-31 01:45:52 +0000
commit4d24b3a0e8a8fae5ac9cf00c3889288c0571b1fc (patch)
tree50220410126eb150747413d6782532e03594439e /crosperf
parent4eb645356394bb17913c7224767e1f47acab4fb4 (diff)
downloadtoolchain-utils-4d24b3a0e8a8fae5ac9cf00c3889288c0571b1fc.tar.gz
Fix problems found when running benchmark_run_unittest.
When the changes to benchmark_run_unittest got committed, somehow the changes to logger.py did not get committed (adding Mock functions to logger). Also, MockMachineManger.AcquireMachine needs an extra parameter, to match change to MachineManager.AcquireMachine. This CL fixes both of those problems. BUG=None TEST=Ran unittests successfully after these changes. Change-Id: I7ae35241ee62ddb484728ffc5c26ea14bc1f7c7f Reviewed-on: https://chrome-internal-review.googlesource.com/164889 Reviewed-by: Yunlian Jiang <yunlian@google.com> Tested-by: Caroline Tice <cmtice@google.com> Commit-Queue: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'crosperf')
-rw-r--r--crosperf/machine_manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/crosperf/machine_manager.py b/crosperf/machine_manager.py
index 04a4eec7..43efdc8f 100644
--- a/crosperf/machine_manager.py
+++ b/crosperf/machine_manager.py
@@ -499,7 +499,7 @@ class MockMachineManager(MachineManager):
machine_name)
self._all_machines.append(cm)
- def AcquireMachine(self, chromeos_image, label):
+ def AcquireMachine(self, chromeos_image, label, throw=False):
for machine in self._all_machines:
if not machine.locked:
machine.locked = True