diff options
| author | cpilch <cpilch@google.com> | 2017-03-28 17:34:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-28 17:34:54 +0000 |
| commit | 21a96408c5f4c882f00e11d952a1e327b1863d9f (patch) | |
| tree | 7c970d4f24950acd774699c71e0d6128c9af851a | |
| parent | 423d1c1b10427f3cda7f65630e824c209c2b648a (diff) | |
| parent | 501e6b7cbe027e3763a674910bf9cdb806b37595 (diff) | |
| download | adt-infra-21a96408c5f4c882f00e11d952a1e327b1863d9f.tar.gz | |
Fixes Carriage Return when testing connected dev
am: 501e6b7cbe
Change-Id: I63c94081405e2eb77b04498578eac8b5afd91595
| -rw-r--r-- | adb_stress_tests/util.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/adb_stress_tests/util.py b/adb_stress_tests/util.py index 6d6b70b7..abc094c4 100644 --- a/adb_stress_tests/util.py +++ b/adb_stress_tests/util.py @@ -38,10 +38,16 @@ def get_connected_devices(): output, error = proc.communicate() connected = [] # Collect connected devices. - for emulator_entry in output.split('\n')[1:]: + # Note that since Windows includes a carriage return, we + # do it in a seperate loop. + if platform.system() is not 'Windows': + for emulator_entry in output.split('\n')[1:]: if emulator_entry != '': - connected.append(emulator_entry.split('\t')[0]) - + connected.append(emulator_entry.split('\t')[0]) + else: + for emulator_entry in output.split('\r\n')[1:]: + if emulator_entry != '': + connected.append(emulator_entry.split('\t')[0]) return connected |