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

am a9456438: Merge "Fix test_adb.py against production builds."

Browse source 
* commit 'a945643831db4ec58988a0773a89f3858d282b07':
  Fix test_adb.py against production builds.
This commit is contained in:
Elliott Hughes 2015-06-06 00:23:07 +00:00 • committed by Android Git Automerger
commit b4d0722d7d
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adb/tests/test_adb.py
View file

@ -249,7 +249,8 @@ class AdbBasic(unittest.TestCase):
def _test_root(self): def _test_root(self):
adb = AdbWrapper() adb = AdbWrapper()
adb.root() if "adbd cannot run as root in production builds" in adb.root():
return
adb.wait() adb.wait()
self.assertEqual("root", adb.shell("id -un").strip()) self.assertEqual("root", adb.shell("id -un").strip())
@ -317,16 +318,13 @@ class AdbBasic(unittest.TestCase):
Bug: http://b/19735063 Bug: http://b/19735063
""" """
output = AdbWrapper().shell("uname"); output = AdbWrapper().shell("uname")
if sys.platform == 'win32': if sys.platform == 'win32':
# adb.exe running on Windows does translation to the Windows \r\n # adb.exe running on Windows does translation to the Windows \r\n
# convention, so we should expect those chars. # convention, so we should expect those chars.
self.assertTrue(output.endswith("\r\n")); self.assertEqual(output, "Linux\r\n")
# If the server outputs \r\n and adb.exe translates that to \r\r\n
# we want to catch that server problem.
self.assertFalse(output.endswith("\r\r\n"));
else: else:
self.assertFalse(output.endswith("\r\n")) self.assertEqual(output, "Linux\n")
class AdbFile(unittest.TestCase): class AdbFile(unittest.TestCase):