diff options
| author | Luis Lozano <llozano@chromium.org> | 2013-03-15 14:44:13 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-03-15 15:51:37 -0700 |
| commit | f81680c018729fd4499e1e200d04b48c4b90127c (patch) | |
| tree | 940608da8374604b82edfdb2d7df55d065f05d4c /crosperf/machine_manager_unittest.py | |
| parent | 2296ee0b914aba5bba07becab4ff68884ce9b8a5 (diff) | |
| download | toolchain-utils-f81680c018729fd4499e1e200d04b48c4b90127c.tar.gz | |
Cleaned up directory after copy of tools from perforce directory
Got rid of stale copies of some tools like "crosperf" and moved all
files under v14 directory (that came from perforce) into the top
directory.
BUG=None
TEST=None
Change-Id: I408d17a36ceb00e74db71403d2351fd466a14f8e
Reviewed-on: https://gerrit-int.chromium.org/33887
Tested-by: Luis Lozano <llozano@chromium.org>
Reviewed-by: Yunlian Jiang <yunlian@google.com>
Commit-Queue: Luis Lozano <llozano@chromium.org>
Diffstat (limited to 'crosperf/machine_manager_unittest.py')
| -rwxr-xr-x | crosperf/machine_manager_unittest.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crosperf/machine_manager_unittest.py b/crosperf/machine_manager_unittest.py index 98baf456..84266d5e 100755 --- a/crosperf/machine_manager_unittest.py +++ b/crosperf/machine_manager_unittest.py @@ -12,7 +12,7 @@ import machine_manager class MyMachineManager(machine_manager.MachineManager): def __init__(self, chromeos_root): - super(MyMachineManager, self).__init__(chromeos_root) + super(MyMachineManager, self).__init__(chromeos_root, 0) def _TryToLockMachine(self, cros_machine): self._machines.append(cros_machine) @@ -30,9 +30,11 @@ class MyMachineManager(machine_manager.MachineManager): CHROMEOS_ROOT = "/tmp/chromeos-root" MACHINE_NAMES = ["lumpy1", "lumpy2", "lumpy3", "daisy1", "daisy2"] LABEL_LUMPY = label.MockLabel("lumpy", "image", CHROMEOS_ROOT, "lumpy", - ["lumpy1", "lumpy2", "lumpy3", "lumpy4"], "") + ["lumpy1", "lumpy2", "lumpy3", "lumpy4"], + "", "", "") LABEL_MIX = label.MockLabel("mix", "image", CHROMEOS_ROOT, "mix", - ["daisy1", "daisy2", "lumpy3", "lumpy4"], "") + ["daisy1", "daisy2", "lumpy3", "lumpy4"], + "", "", "") class MachineManagerTest(unittest.TestCase): |