diff options
| author | cpilch <cpilch@google.com> | 2017-03-28 10:21:34 -0700 |
|---|---|---|
| committer | cpilch <cpilch@google.com> | 2017-03-28 10:21:34 -0700 |
| commit | 501e6b7cbe027e3763a674910bf9cdb806b37595 (patch) | |
| tree | 7c970d4f24950acd774699c71e0d6128c9af851a | |
| parent | 1ba4930db92796305008a4540a5ad42208de31cb (diff) | |
| download | adt-infra-501e6b7cbe027e3763a674910bf9cdb806b37595.tar.gz | |
Fixes Carriage Return when testing connected dev
For Windows, properly handle carriage return when calling .split() on
the returned devices.
Change-Id: Ia76b4240ca746b46c7bfefd424e0015126c497a0
| -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 |