diff options
| author | Chase Qi <chase.qi@linaro.org> | 2017-09-14 11:05:11 +0800 |
|---|---|---|
| committer | Chase Qi <chase.qi@linaro.org> | 2017-09-14 11:05:11 +0800 |
| commit | 010482b3d893f52e19a955229307a706d09921e8 (patch) | |
| tree | 6931a9690b4f4557bed15b46293d86ccab043800 /automated/android | |
| parent | dc689891c951627dcb5df0d30a74adf483722b92 (diff) | |
android: use adb_debug_info() in tradefed-runner
'lsusb' output in LXC is misleading. The issue has been fixed in
adb_debug_info(). This patch removes the old approach in tradefed-runner
and uses improved adb_debug_info().
Change-Id: I52c2bdc22e2fcc9bea95d762b51edc35897effeb
Signed-off-by: Chase Qi <chase.qi@linaro.org>
Diffstat (limited to 'automated/android')
| -rwxr-xr-x | automated/android/tradefed/tradefed-runner.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/automated/android/tradefed/tradefed-runner.py b/automated/android/tradefed/tradefed-runner.py index edbe35e..b0c5d77 100755 --- a/automated/android/tradefed/tradefed-runner.py +++ b/automated/android/tradefed/tradefed-runner.py @@ -164,10 +164,7 @@ while child.isalive(): adb_command = "adb shell echo OK" adb_check = subprocess.Popen(shlex.split(adb_command)) if adb_check.wait() != 0: - logger.debug('"find /dev/bus/usb" output') - subprocess.call(['find', '/dev/bus/usb']) - logger.debug('"lsusb" output') - subprocess.call('lsusb') + subprocess.call(['sh', '-c', '. ../../lib/sh-test-lib && . ../../lib/android-test-lib && adb_debug_info']) logger.debug('"adb devices" output') subprocess.call(['adb', 'devices']) logger.error('adb connection lost!! Will wait for 5 minutes and terminating tradefed shell test as adb connection is lost!') |