diff options
| author | Josh Gao <jmgao@google.com> | 2015-11-07 17:56:19 -0800 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2015-11-07 17:56:19 -0800 |
| commit | 7fe79d6515ef45a15e6c832afe08f5de2bfe1f48 (patch) | |
| tree | 844d0461ce7620d5303b522b5cc7cade39fba420 /python-packages | |
| parent | 084d084bbce132561d91b6e0fbef8ad1fe7e7099 (diff) | |
| download | android_development-7fe79d6515ef45a15e6c832afe08f5de2bfe1f48.tar.gz android_development-7fe79d6515ef45a15e6c832afe08f5de2bfe1f48.tar.bz2 android_development-7fe79d6515ef45a15e6c832afe08f5de2bfe1f48.zip | |
adb: update tests for push/pull directory change.
Bug: http://b/25394682
Change-Id: Iaae5ceedc7a38e9981503a81136966939c6d7280
Diffstat (limited to 'python-packages')
| -rw-r--r-- | python-packages/adb/test_device.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/python-packages/adb/test_device.py b/python-packages/adb/test_device.py index 0b1bb641d..0a82dc2db 100644 --- a/python-packages/adb/test_device.py +++ b/python-packages/adb/test_device.py @@ -690,10 +690,7 @@ class FileOperationsTest(DeviceTest): for temp_file in temp_files: remote_path = posixpath.join(self.DEVICE_TEMP_DIR, - # BROKEN: http://b/25394682 - # posixpath.dirname( - # posixpath.dirname( - # temp_file.full_path)), + os.path.basename(host_dir), temp_file.base_name) self._verify_remote(temp_file.checksum, remote_path) self.device.shell(['rm', '-rf', self.DEVICE_TEMP_DIR]) @@ -838,7 +835,7 @@ class FileOperationsTest(DeviceTest): self.device.shell(['rm', '-rf', self.DEVICE_TEMP_DIR]) self.device.shell(['mkdir', '-p', remote_empty_path]) - self.device.pull(remote=self.DEVICE_TEMP_DIR, local=host_dir) + self.device.pull(remote=remote_empty_path, local=host_dir) self.assertTrue(os.path.isdir(os.path.join(host_dir, 'empty'))) finally: if host_dir is not None: @@ -871,8 +868,7 @@ class FileOperationsTest(DeviceTest): for subdir_temp_file in subdir_temp_files: local_path = os.path.join(host_dir, - # BROKEN: http://b/25394682 - # "subdir", + "subdir", subdir_temp_file.base_name) self._verify_local(subdir_temp_file.checksum, local_path) |