diff options
| author | cpilch <cpilch@google.com> | 2017-03-28 17:43:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-28 17:43:24 +0000 |
| commit | 9836cad9c88de77cd2bb9195763dba13ee53af8d (patch) | |
| tree | 6f55c349f629af3c2a120d81731e28572d88eb7e | |
| parent | 0c94218c7ab406176b4a0957e489d556289e7110 (diff) | |
| parent | 3c8d72d8cd039be229978504ace8cb032fc003da (diff) | |
| download | adt-infra-9836cad9c88de77cd2bb9195763dba13ee53af8d.tar.gz | |
Fixes Carriage Return when testing connected dev am: 501e6b7cbe am: 21a96408c5
am: 3c8d72d8cd
Change-Id: I5443e7d3254beebd5db176376e1654a25967ccf8
| -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 |