diff options
| -rwxr-xr-x | crosperf/benchmark_run_unittest.py | 2 | ||||
| -rw-r--r-- | crosperf/experiment.py | 9 | ||||
| -rw-r--r-- | crosperf/machine_manager.py | 5 | ||||
| -rwxr-xr-x | crosperf/machine_manager_unittest.py | 3 | ||||
| -rwxr-xr-x | crosperf/results_cache_unittest.py | 4 |
5 files changed, 10 insertions, 13 deletions
diff --git a/crosperf/benchmark_run_unittest.py b/crosperf/benchmark_run_unittest.py index 744f89c1..23720e33 100755 --- a/crosperf/benchmark_run_unittest.py +++ b/crosperf/benchmark_run_unittest.py @@ -70,7 +70,7 @@ class BenchmarkRunTest(unittest.TestCase): compiler='gcc') logging_level = 'average' - m = MockMachineManager('/tmp/chromeos_root', 0, logging_level) + m = MockMachineManager('/tmp/chromeos_root', 0, logging_level, '') m.AddMachine('chromeos2-row1-rack4-host9.cros') bench = Benchmark('page_cycler.netsim.top_10', # name 'page_cycler.netsim.top_10', # test_name diff --git a/crosperf/experiment.py b/crosperf/experiment.py index de172cb1..bfee351d 100644 --- a/crosperf/experiment.py +++ b/crosperf/experiment.py @@ -71,12 +71,11 @@ class Experiment(object): raise RuntimeError('No chromeos_root given and could not determine ' 'one from the image path.') + machine_manager_fn = MachineManager if test_flag.GetTestMode(): - self.machine_manager = MockMachineManager(chromeos_root, acquire_timeout, - log_level) - else: - self.machine_manager = MachineManager(chromeos_root, acquire_timeout, - log_level, locks_directory) + machine_manager_fn = MockMachineManager + self.machine_manager = machine_manager_fn(chromeos_root, acquire_timeout, + log_level, locks_directory) self.l = logger.GetLogger(log_dir) for machine in self.remote: diff --git a/crosperf/machine_manager.py b/crosperf/machine_manager.py index 86c63a20..8887f8bd 100644 --- a/crosperf/machine_manager.py +++ b/crosperf/machine_manager.py @@ -656,10 +656,9 @@ power management: class MockMachineManager(MachineManager): """Mock machine manager class.""" - def __init__(self, chromeos_root, acquire_timeout, log_level): + def __init__(self, chromeos_root, acquire_timeout, log_level, locks_dir): super(MockMachineManager, self).__init__( - chromeos_root, acquire_timeout, log_level, - file_lock_machine.Machine.LOCKS_DIR) + chromeos_root, acquire_timeout, log_level, locks_dir) def _TryToLockMachine(self, cros_machine): self._machines.append(cros_machine) diff --git a/crosperf/machine_manager_unittest.py b/crosperf/machine_manager_unittest.py index 9889f9cd..a958f267 100755 --- a/crosperf/machine_manager_unittest.py +++ b/crosperf/machine_manager_unittest.py @@ -79,7 +79,7 @@ class MachineManagerTest(unittest.TestCase): mock_isdir.return_value = True self.mm = machine_manager.MachineManager( '/usr/local/chromeos', 0, 'average', - file_lock_machine.Machine.LOCKS_DIR, self.mock_cmd_exec, + None, self.mock_cmd_exec, self.mock_logger) self.mock_lumpy1.name = 'lumpy1' @@ -241,7 +241,6 @@ class MachineManagerTest(unittest.TestCase): @mock.patch.object(command_executer.CommandExecuter, 'CrosRunCommandWOutput') def test_try_to_lock_machine(self, mock_cros_runcmd): - self.assertRaises(self.mm._TryToLockMachine, None) mock_cros_runcmd.return_value = [0, 'false_lock_checksum', ''] diff --git a/crosperf/results_cache_unittest.py b/crosperf/results_cache_unittest.py index f828dab9..a79ff862 100755 --- a/crosperf/results_cache_unittest.py +++ b/crosperf/results_cache_unittest.py @@ -748,7 +748,7 @@ class ResultTest(unittest.TestCase): tempfile.mkdtemp = FakeMkdtemp mock_mm = machine_manager.MockMachineManager('/tmp/chromeos_root', 0, - 'average') + 'average', '') mock_mm.machine_checksum_string['mock_label'] = 'fake_machine_checksum123' mock_keylist = ['key1', 'key2', 'key3'] @@ -934,7 +934,7 @@ class ResultsCacheTest(unittest.TestCase): '/tmp/chromeos', 'average') mock_mm = machine_manager.MockMachineManager('/tmp/chromeos_root', 0, - 'average') + 'average', '') mock_mm.machine_checksum_string['mock_label'] = 'fake_machine_checksum123' self.results_cache.Init(self.mock_label.chromeos_image, |