ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: fix test_device.py shell protocol checks."

Browse source
This commit is contained in:
Treehugger Robot 2016-04-26 21:35:55 +00:00 • committed by Gerrit Code Review
commit 52eb6025ed
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adb/test_device.py
View file

@ -279,7 +279,7 @@ class ShellTest(DeviceTest):
Raises: Raises:
unittest.SkipTest: The device doesn't support exit codes. unittest.SkipTest: The device doesn't support exit codes.
""" """
if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features: if not self.device.has_shell_protocol():
raise unittest.SkipTest('exit codes are unavailable on this device') raise unittest.SkipTest('exit codes are unavailable on this device')
proc = subprocess.Popen( proc = subprocess.Popen(
@ -342,7 +342,7 @@ class ShellTest(DeviceTest):
a terminal stdin to test so this test will be skipped if stdin a terminal stdin to test so this test will be skipped if stdin
is not a terminal. is not a terminal.
""" """
if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features: if not self.device.has_shell_protocol():
raise unittest.SkipTest('PTY arguments unsupported on this device') raise unittest.SkipTest('PTY arguments unsupported on this device')
if not os.isatty(sys.stdin.fileno()): if not os.isatty(sys.stdin.fileno()):
raise unittest.SkipTest('PTY tests require stdin terminal') raise unittest.SkipTest('PTY tests require stdin terminal')
@ -394,7 +394,7 @@ class ShellTest(DeviceTest):
Bug: http://b/19734861 Bug: http://b/19734861
""" """
if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features: if not self.device.has_shell_protocol():
raise unittest.SkipTest('shell protocol unsupported on this device') raise unittest.SkipTest('shell protocol unsupported on this device')
# Shell protocol should be used by default. # Shell protocol should be used by default.
@ -424,7 +424,7 @@ class ShellTest(DeviceTest):
Bug: http://b/23825725 Bug: http://b/23825725
""" """
if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features: if not self.device.has_shell_protocol():
raise unittest.SkipTest('shell protocol unsupported on this device') raise unittest.SkipTest('shell protocol unsupported on this device')
# Start a long-running process. # Start a long-running process.
@ -445,7 +445,7 @@ class ShellTest(DeviceTest):
def test_non_interactive_stdin(self): def test_non_interactive_stdin(self):
"""Tests that non-interactive shells send stdin.""" """Tests that non-interactive shells send stdin."""
if self.device.SHELL_PROTOCOL_FEATURE not in self.device.features: if not self.device.has_shell_protocol():
raise unittest.SkipTest('non-interactive stdin unsupported ' raise unittest.SkipTest('non-interactive stdin unsupported '
'on this device') 'on this device')