diff options
| author | Josh Gao <jmgao@google.com> | 2015-12-10 18:09:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-10 18:09:53 +0000 |
| commit | f31aba9e8d976039398dbc694f7a1bd57da6e8e6 (patch) | |
| tree | ac68c5b4331f1a7d1c07f5c8ebe283a897ccefce | |
| parent | 4d0e10b24e6535297424ebfe6682a1239d1a6d18 (diff) | |
| parent | ce8f2cdcd09b24e3deb88ffefb071752f79ab1bb (diff) | |
| download | core-f31aba9e8d976039398dbc694f7a1bd57da6e8e6.tar.gz core-f31aba9e8d976039398dbc694f7a1bd57da6e8e6.tar.bz2 core-f31aba9e8d976039398dbc694f7a1bd57da6e8e6.zip | |
Merge "adb: make the test_pull_dir test actually test something."
| -rw-r--r-- | adb/test_device.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/test_device.py b/adb/test_device.py index 8d754687d..955b67a80 100644 --- a/adb/test_device.py +++ b/adb/test_device.py @@ -819,7 +819,10 @@ class FileOperationsTest(DeviceTest): self.device.pull(remote=self.DEVICE_TEMP_DIR, local=host_dir) for temp_file in temp_files: - host_path = os.path.join(host_dir, temp_file.base_name) + host_path = os.path.join( + host_dir, posixpath.basename(self.DEVICE_TEMP_DIR), + temp_file.base_name) + self._verify_local(temp_file.checksum, host_path) self.device.shell(['rm', '-rf', self.DEVICE_TEMP_DIR]) finally: |