am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb."

* commit '3fe6de1c39f532d4f462da8acbb3d2e84ee1a053':
  Add a simple test for using non-ASCII paths with adb.
This commit is contained in:
Elliott Hughes 2015-07-24 23:22:35 +00:00 committed by Android Git Automerger
commit b8fa711fa9

View file

@ -1,4 +1,6 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
# -*- coding: utf-8 -*-
"""Simple conformance test for adb. """Simple conformance test for adb.
This script will use the available adb in path and run simple This script will use the available adb in path and run simple
@ -336,6 +338,21 @@ class AdbBasic(unittest.TestCase):
self.assertEqual(1, status_code) self.assertEqual(1, status_code)
self.assertIn("error", output) self.assertIn("error", output)
def test_unicode_paths(self):
"""Ensure that we can support non-ASCII paths, even on Windows."""
adb = AdbWrapper()
name = u'로보카 폴리'.encode('utf-8')
# push.
tf = tempfile.NamedTemporaryFile("wb", suffix=name)
adb.push(tf.name, "/data/local/tmp/adb-test-{}".format(name))
# pull.
adb.shell("rm \"'/data/local/tmp/adb-test-*'\"".format(name))
adb.shell("touch \"'/data/local/tmp/adb-test-{}'\"".format(name))
tf = tempfile.NamedTemporaryFile("wb", suffix=name)
adb.pull("/data/local/tmp/adb-test-{}".format(name), tf.name)
class AdbFile(unittest.TestCase): class AdbFile(unittest.TestCase):
SCRATCH_DIR = "/data/local/tmp" SCRATCH_DIR = "/data/local/tmp"