diff options
| author | David Sharp <dhsharp@google.com> | 2016-01-22 17:52:01 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-01-26 21:03:15 +0000 |
| commit | a93683485612c985c661eb4ebbb02a7ae1c4a623 (patch) | |
| tree | 6edebd8dbb16becd545b12a2a4a276db3fd407a1 /crosperf/machine_manager_unittest.py | |
| parent | 748254e9a5dd7227806ca618d1f9a32ab49f4056 (diff) | |
| download | toolchain-utils-a93683485612c985c661eb4ebbb02a7ae1c4a623.tar.gz | |
crosperf: Make things work without access to file locks dir
Before this change, running with --dry_run would result in an
error accessing the lock file directory if the user does not
have access to the directory.
Also disable using file locks in machine_manager_unittest
TEST=run crosperf with --dry_run; unit tests
BUG=none
Change-Id: I8283bc38fd388dfa90fb772e76370a674e86b86f
Reviewed-on: https://chrome-internal-review.googlesource.com/245899
Commit-Ready: David Sharp <dhsharp@google.com>
Tested-by: David Sharp <dhsharp@google.com>
Reviewed-by: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'crosperf/machine_manager_unittest.py')
| -rwxr-xr-x | crosperf/machine_manager_unittest.py | 3 |
1 files changed, 1 insertions, 2 deletions
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', ''] |