Commit Graph

19 Commits

Author SHA1 Message Date
Josh Gao
7f6e8ddb79 gdbrunner: expose adb.split_lines, use it.
Change-Id: I895aacaababf87c1e82ff5604c028cc475207304
2016-03-28 11:26:03 -07:00
Dan Albert
9bee8c209c Replace splitlines() with something more tolerant.
Old devices suck. Old devices on Windows seem to suck harder.

Change-Id: I88df25d2c480439859c913e9d8f8fb7ef04b7d5b
2016-02-24 12:28:45 -08:00
Dan Albert
aaf5455b16 Add a fix for old, broken devices.
Not sure exactly why this happens, but it keeps cropping up on my JB
nakasi when running the NDK tests.

Change-Id: Ic5c35f9ab01c0a83f98a6d074220c89ec765a812
2016-02-24 11:39:42 -08:00
Dan Albert
5ca14aa777 Fix the pylint issues that have built up...
Change-Id: I73b14c468a27dffb5c3524b2141682f9e1cafe35
2016-02-24 11:39:14 -08:00
Spencer Low
82aa7da5a6 win32: for Unicode cmdline args, switch from cmd.exe to powershell.exe
Previously, to pass a subprocess cmdline args with Unicode characters,
we'd write the command line to a batch file and run it with cmd.exe. The
problem was that the batch file used chcp to get cmd.exe to be able to
read UTF-8 from the batch file, but this had the side-effect of changing
the codepage of the user's console window.

Instead of saving & restoring the codepage (which would always have the
risk of somehow leaving the console in the wrong codepage if a Ctrl-C
handler somehow wasn't called, or if Task Manager was used manually,
etc.), we use Windows PowerShell as the helper instead of cmd.exe.

PowerShell is installed on every version of Windows since Windows 7 and
is a separate free download for Windows XP and Windows Vista, but
realistically Windows XP is no longer supported by Microsoft and
probably no one chooses to run Windows Vista over Windows 7. Plus, this
change only uses PowerShell if Unicode args are passed.

Switching to PowerShell allows us to get rid of the temp file, context
manager, and messy __del__ that caused a variety of problems in the
past.

Change-Id: Ia3df533f7747f7b9b28a093f8ca24117371e5e59
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-21 20:39:56 -08:00
David Pursell
51f2cc2185 adb: fix device module for non-shell_v2 usage.
The device.py module was incorrectly querying the return code when the
shell_v2 return code isn't available.

This CL fixes it by specifying the return code probe as an argument
list rather than a single string argument. This means that before the
device was executing something like this:

  /system/bin/sh getprop '; echo $?'

which didn't do what we wanted. Now it does something like this:

  /system/bin/sh getprop ; echo $?

Bug: http://b/25470461
Change-Id: I5e20da31ec7ecc782c6146d8b38d752d52082860
2015-11-05 11:26:42 -08:00
Spencer Low
5e50d6b443 unittest for sending data thru adb forward/reverse; --no-rebind unittest
Added --no-rebind unittest to test fix
a6b340af123b82e3aaa33cb2a0d45f637eeb4759

Change-Id: I2286b7f652c84fbc79d8860c9a04594d3284ee68
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-04 22:12:26 -08:00
Yabin Cui
0e54d10df7 adb: add test for forward/reverse commands.
Bug: 25355808
Change-Id: Idc636569b0699c2acc3bf674fdcfd25c74b83121
2015-11-02 12:21:52 -08:00
Josh Gao
3fd43b5bf4 Allow selection of adb command.
This is useful for ndk-gdb.py on Windows.

Change-Id: I2a2b6b50ae00bcfc530c555f06c945b4f53f9999
2015-10-28 14:18:55 -07:00
David Pursell
cebec2b69b device.py: fix _subprocess_Popen cleanup.
Every time gdbclient.py finishes it's giving this error:

Exception TypeError: 'must be type, not None' in <bound method
_subprocess_Popen.__del__ of <adb.device._subprocess_Popen object at
0x7fdd48e76850>> ignored

Basically super(_subprocess_Popen, self) was failing because at that
point _subprocess_Popen is None since global teardown had already
deleted the reference.

This fix saves local references to required global objects so that they
stick around until we're done with them. We may want to start looking
into making _subprocess_Popen a context manager instead, usage won't be
as convenient but __del__() does not scale to general use well. For now
though this CL seems to solve the problem for gdbclient.py.

Change-Id: I6c2a9fe0c108ae600cf05eb3b887d56959c7308e
2015-10-20 10:29:21 -07:00
Spencer Low
4160958015 adb unittest: fix Windows Unicode
adb.shell() was recently changed to use subprocess.Popen(), which
doesn't work properly with Unicode on Windows. The fix is to use the
same work-around that I did for subprocess.check_output(): write UTF-8
to a batch file and run it. The change is primarily refactoring to
enable code reuse.

Change-Id: I88e9b9b35e5318533c0cd932d92e13bc9e734092
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-10-13 19:51:30 -07:00
David Pursell
45d61d070f adb: fix docstring for shell functions.
Change-Id: Iaae8605b18583c38e517f865083012204d236832
2015-10-12 15:55:38 -07:00
David Pursell
46e268e990 adb: make shell protocol work again.
http://r.android.com/173810 changed the shell feature name. This CL
updates the python scripts to re-enable shell protocol tests, and adds
an additional test for `adb shell -x`.

Change-Id: I961adf7abd1782ea98f3f82d8af11dcaa02f9570
2015-09-30 17:22:32 -07:00
Josh Gao
87df6ff2c8 Add get_props to adb.py's AndroidDevice.
Saves adb shell roundtrips if multiple properties are needed.

Change-Id: I3a9fc0354b6eb0ee5389984e3f345c380404658c
2015-09-30 14:36:35 -07:00
Josh Gao
cac4e977bb Add remount to adb.py's AndroidDevice.
Change-Id: If1e17a49e81af840b76eab52db89bc9de09958fe
2015-09-30 14:36:35 -07:00
Josh Gao
21f984939b Add shell_popen method to adb.py.
This is mostly to allow backgrounding of processes run through adb
(gdbserver in particular).

Bug: http://b/23715403
Change-Id: I47fbebbd05d58044b4c447ffa86e0ab97d920278
2015-09-30 14:36:35 -07:00
Josh Gao
a8731c4be0 Add helper functions for adb -e/-d to adb.py.
Bug: http://b/22946322
Change-Id: I847f561d617b17f4e6323e0abb46dd270d041782
2015-09-30 14:36:35 -07:00
David Pursell
d89fcd4f76 adb: add tests for -Tt shell arguments.
Adds python tests to check that -T (disable PTY) and -t (force PTY)
arguments work as expected for `adb shell`.

Bug: http://b/23825231
Change-Id: I5343fae35b2be8459a9b95125f66def46c26adf4
2015-09-22 12:50:39 -07:00
Dan Albert
32e1307f45 Move python-adb from system/core/adb.
This really ought to be maintained as a separate project. Also adds a
setup.py for distribution.

Bug: http://b/22881740
Change-Id: I8e11e4154fac21d3196a533613822b236b2b73e6
2015-09-18 13:41:56 -07:00