summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-21 23:45:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-21 23:45:59 +0000
commit14000a3a35d42815a95dce63b40f71e5a6cb9128 (patch)
tree00f08981a30d69bbaa523fabac0baa7b71f25591
parenta7d470920f7d92b58e6072c6e5555204655d0467 (diff)
parent9a0cea92c8b74114b70ac3339b2b611633f6a31a (diff)
downloadsystem_core-14000a3a35d42815a95dce63b40f71e5a6cb9128.zip
system_core-14000a3a35d42815a95dce63b40f71e5a6cb9128.tar.gz
system_core-14000a3a35d42815a95dce63b40f71e5a6cb9128.tar.bz2
am 9a0cea92: Merge "Add a couple more adb shell regression tests."
* commit '9a0cea92c8b74114b70ac3339b2b611633f6a31a': Add a couple more adb shell regression tests.
-rwxr-xr-xadb/tests/test_adb.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/adb/tests/test_adb.py b/adb/tests/test_adb.py
index 69dead2..52d8056 100755
--- a/adb/tests/test_adb.py
+++ b/adb/tests/test_adb.py
@@ -275,6 +275,10 @@ class AdbBasic(unittest.TestCase):
result = adb.shell("sh -c 'echo hello; echo world'").splitlines()
self.assertEqual(["hello", "world"], result)
+ # http://b/15479704
+ self.assertEqual('t', adb.shell("'true && echo t'").strip())
+ self.assertEqual('t', adb.shell("sh -c 'true && echo t'").strip())
+
class AdbFile(unittest.TestCase):
SCRATCH_DIR = "/data/local/tmp"