LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "adb: update tests for push/pull directory change."

Browse Source
This commit is contained in:
Josh Gao
2015-11-11 23:22:47 +00:00
committed by Gerrit Code Review
parent 95f81b0afa 7fe79d6515
commit 95e0260252
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python-packages/adb/test_device.py
View File

@@ -690,10 +690,7 @@ class FileOperationsTest(DeviceTest):
for temp_file in temp_files: for temp_file in temp_files:
remote_path = posixpath.join(self.DEVICE_TEMP_DIR, remote_path = posixpath.join(self.DEVICE_TEMP_DIR,
# BROKEN: http://b/25394682 os.path.basename(host_dir),
# posixpath.dirname(
# posixpath.dirname(
# temp_file.full_path)),
temp_file.base_name) temp_file.base_name)
self._verify_remote(temp_file.checksum, remote_path) self._verify_remote(temp_file.checksum, remote_path)
self.device.shell(['rm', '-rf', self.DEVICE_TEMP_DIR]) 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(['rm', '-rf', self.DEVICE_TEMP_DIR])
self.device.shell(['mkdir', '-p', remote_empty_path]) 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'))) self.assertTrue(os.path.isdir(os.path.join(host_dir, 'empty')))
finally: finally:
if host_dir is not None: if host_dir is not None:
@@ -871,8 +868,7 @@ class FileOperationsTest(DeviceTest):
for subdir_temp_file in subdir_temp_files: for subdir_temp_file in subdir_temp_files:
local_path = os.path.join(host_dir, local_path = os.path.join(host_dir,
# BROKEN: http://b/25394682 "subdir",
# "subdir",
subdir_temp_file.base_name) subdir_temp_file.base_name)
self._verify_local(subdir_temp_file.checksum, local_path) self._verify_local(subdir_temp_file.checksum, local_path)