diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 23:03:39 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 23:03:39 +0000 |
| commit | 043e41762215cd4c6d93880d6c381adcd9e818aa (patch) | |
| tree | 8817b65a91868417aea241648a856fa1572f67cc /tools/telemetry | |
| parent | dbc3c1a2985abc605e799522dda1a817305bd490 (diff) | |
| download | chromium_src-043e41762215cd4c6d93880d6c381adcd9e818aa.zip chromium_src-043e41762215cd4c6d93880d6c381adcd9e818aa.tar.gz chromium_src-043e41762215cd4c6d93880d6c381adcd9e818aa.tar.bz2 | |
[Telemetry] Fix page cyclers on CrOS.
r186539 changed RunCmdOnDevice() to return a tuple of (stdout, stderr) and
didn't update these callsites.
BUG=225115
TEST=Moz page cycler on cros
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/13165015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/cros_platform_backend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/cros_platform_backend.py b/tools/telemetry/telemetry/core/chrome/cros_platform_backend.py index cbfb6f1..5440ede 100644 --- a/tools/telemetry/telemetry/core/chrome/cros_platform_backend.py +++ b/tools/telemetry/telemetry/core/chrome/cros_platform_backend.py @@ -17,7 +17,7 @@ class CrosPlatformBackend(platform_backend.PlatformBackend): def _GetFileContents(self, filename): try: - return self._cri.RunCmdOnDevice(['cat', filename]) + return self._cri.RunCmdOnDevice(['cat', filename])[0] except AssertionError: return '' @@ -67,7 +67,7 @@ class CrosPlatformBackend(platform_backend.PlatformBackend): def GetChildPids(self, pid): """Retunds a list of child pids of |pid|.""" child_pids = [] - pid_ppid_list = self._cri.RunCmdOnDevice( + pid_ppid_list, _ = self._cri.RunCmdOnDevice( ['ps', '-e', '-o', 'pid=', '-o', 'ppid=']) for pid_ppid in pid_ppid_list.splitlines(): curr_pid, curr_ppid = pid_ppid.split() |