diff options
| author | Luis Lozano <llozano@chromium.org> | 2015-12-10 10:47:01 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-12-15 01:21:49 +0000 |
| commit | 036c9233742004aa773a374df381b1cf137484f5 (patch) | |
| tree | b1566971ae12ed6ec13f086dd450eca741604f26 /image_chromeos.py | |
| parent | e627fd61c2edba668eb2af8221892286b13f05a3 (diff) | |
| download | toolchain-utils-036c9233742004aa773a374df381b1cf137484f5.tar.gz | |
crosperf: RunCommand should return one type of object.
Cleaned up the interfaces for the RunCommand routines.
These were returning different types (int or tuple) depending on
the value of the return_ouput parameter.
Returning different unrelated types from a routine is bad practice.
Linter complains about this with several warnings like this:
"Attempting to unpack a non-sequence defined at line XY of
utils.command_executer"
BUG=chromium:566256
TEST=ran crosperf with a example experiment file
Ran run_tests.
Change-Id: Ibb83ab9322c87558077fc4937ef5c0686bbe5417
Reviewed-on: https://chrome-internal-review.googlesource.com/241459
Commit-Ready: Luis Lozano <llozano@chromium.org>
Tested-by: Luis Lozano <llozano@chromium.org>
Reviewed-by: Han Shen <shenhan@google.com>
Diffstat (limited to 'image_chromeos.py')
| -rwxr-xr-x | image_chromeos.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/image_chromeos.py b/image_chromeos.py index 1d977e03..4b764b06 100755 --- a/image_chromeos.py +++ b/image_chromeos.py @@ -141,11 +141,8 @@ def DoImage(argv): image_checksum = FileUtils().Md5File(image, log_level=log_level) command = "cat " + checksum_file - retval, device_checksum, _ = cmd_executer.CrosRunCommand( - command, - return_output=True, - chromeos_root=options.chromeos_root, - machine=options.remote) + retval, device_checksum, _ = cmd_executer.CrosRunCommandWOutput( + command, chromeos_root=options.chromeos_root, machine=options.remote) device_checksum = device_checksum.strip() image_checksum = str(image_checksum) @@ -368,10 +365,8 @@ def VerifyChromeChecksum(chromeos_root, image, remote, log_level): unmount=True) command = "md5sum /opt/google/chrome/chrome" - [_, o, _] = cmd_executer.CrosRunCommand(command, - return_output=True, - chromeos_root=chromeos_root, - machine=remote) + [_, o, _] = cmd_executer.CrosRunCommandWOutput( + command, chromeos_root=chromeos_root, machine=remote) device_chrome_checksum = o.split()[0] if image_chrome_checksum.strip() == device_chrome_checksum.strip(): return True |