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 /crb | |
| 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 'crb')
| -rw-r--r-- | crb/autotest_run.py | 2 | ||||
| -rw-r--r-- | crb/machine_manager_singleton.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crb/autotest_run.py b/crb/autotest_run.py index bae2547f..565246db 100644 --- a/crb/autotest_run.py +++ b/crb/autotest_run.py @@ -254,7 +254,7 @@ class AutotestRun(threading.Thread): " cros_sdk -- /usr/sbin/perf report --symfs=/build/%s" " -i %s --stdio" % (self.chromeos_root, self.board, perf_data_file)) - ret, out, err = self._ce.RunCommand(command, return_output=True) + ret, out, err = self._ce.RunCommandWOutput(command) with open(os.path.join(self.cache_dir, "perf.report"), "wb") as f: f.write(out) return self.retval diff --git a/crb/machine_manager_singleton.py b/crb/machine_manager_singleton.py index 93629c4c..80369216 100644 --- a/crb/machine_manager_singleton.py +++ b/crb/machine_manager_singleton.py @@ -56,8 +56,8 @@ class MachineManagerSingleton(object): if locked: ce = command_executer.GetCommandExecuter() command = "cat %s" % image_chromeos.checksum_file - ret, out, err = ce.CrosRunCommand( - command, return_output=True, chromeos_root=self.chromeos_root, + ret, out, err = ce.CrosRunCommandWOutput( + command, chromeos_root=self.chromeos_root, machine=cros_machine.name) if ret == 0: cros_machine.checksum = out.strip() |