diff options
author | Caroline Tice <cmtice@google.com> | 2015-12-10 12:09:40 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2015-12-11 03:51:12 +0000 |
commit | 7057cf67ba1dbdd4387f53e5fe47b43c955b1a53 (patch) | |
tree | c4dd4303b356240113781f1e0c71d1628911d7c3 /crosperf/experiment_runner.py | |
parent | 939274265fbac8c7f3d47c4e36c680d58cd578e9 (diff) | |
download | toolchain-utils-7057cf67ba1dbdd4387f53e5fe47b43c955b1a53.tar.gz |
Crosperf: Fix many broken unittests.
Apparently people have been making changes and not running the
unittests; many of the unittests were suffering from bit-rot. This
CL fixes most of the broken unittests (there are still 3 large ones
being worked on -- that will be in another CL).
BUG=chromium:567883
TEST=Verified that these unittests work now.
Change-Id: I0252a276a035894e70e04c61339cdba148c9bbfd
Reviewed-on: https://chrome-internal-review.googlesource.com/241513
Commit-Ready: Luis Lozano <llozano@chromium.org>
Tested-by: Luis Lozano <llozano@chromium.org>
Reviewed-by: Luis Lozano <llozano@chromium.org>
Diffstat (limited to 'crosperf/experiment_runner.py')
-rw-r--r-- | crosperf/experiment_runner.py | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/crosperf/experiment_runner.py b/crosperf/experiment_runner.py index 7167b805..971b967c 100644 --- a/crosperf/experiment_runner.py +++ b/crosperf/experiment_runner.py @@ -7,6 +7,7 @@ import shutil import time import afe_lock_machine +import test_flag from cros_utils import command_executer from cros_utils import logger @@ -82,25 +83,29 @@ class ExperimentRunner(object): requested for this crosperf run, to prevent any other crosperf runs from being able to update/use the machines while this experiment is running. """ - lock_mgr = afe_lock_machine.AFELockManager( - self._GetMachineList(), - "", - experiment.labels[0].chromeos_root, - None, - log=self.l, - ) - for m in lock_mgr.machines: - if not lock_mgr.MachineIsKnown(m): - lock_mgr.AddLocalMachine(m) - machine_states = lock_mgr.GetMachineStates("lock") - lock_mgr.CheckMachineLocks(machine_states, "lock") - self.locked_machines = lock_mgr.UpdateMachines(True) - self._experiment.locked_machines = self.locked_machines - self._UpdateMachineList(self.locked_machines) - self._experiment.machine_manager.RemoveNonLockedMachines( - self.locked_machines) - if len(self.locked_machines) == 0: - raise RuntimeError("Unable to lock any machines.") + if test_flag.GetTestMode(): + self.locked_machines = self._GetMachineList() + self._experiment.locked_machines = self.locked_machines + else: + lock_mgr = afe_lock_machine.AFELockManager( + self._GetMachineList(), + "", + experiment.labels[0].chromeos_root, + None, + log=self.l, + ) + for m in lock_mgr.machines: + if not lock_mgr.MachineIsKnown(m): + lock_mgr.AddLocalMachine(m) + machine_states = lock_mgr.GetMachineStates("lock") + lock_mgr.CheckMachineLocks(machine_states, "lock") + self.locked_machines = lock_mgr.UpdateMachines(True) + self._experiment.locked_machines = self.locked_machines + self._UpdateMachineList(self.locked_machines) + self._experiment.machine_manager.RemoveNonLockedMachines( + self.locked_machines) + if len(self.locked_machines) == 0: + raise RuntimeError("Unable to lock any machines.") def _UnlockAllMachines(self, experiment): """Attempt to globally unlock all of the machines requested for run. @@ -108,7 +113,7 @@ class ExperimentRunner(object): The method will use the AFE server to globally unlock all of the machines requested for this crosperf run. """ - if not self.locked_machines: + if not self.locked_machines or test_flag.GetTestMode(): return lock_mgr = afe_lock_machine.AFELockManager( |