commit 63dfa831d8e88323dc9c9ca12b88bf6b8e2ca200
author Josh Gao <jmgao@google.com> Thu Dec 10 10:17:38 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 10:17:38 2015 -0800
tree 8023f6f7da6c9e29dcac651550cf89f24e180b4a
parent e011d8db13838832a090e969bb61bbb4a9e9658c
parent c6b3f8038af695841d0b79c4be2315e83defe6b3

Merge "adb: make the test_pull_dir test actually test something."
am: f31aba9e8d

* commit 'f31aba9e8d976039398dbc694f7a1bd57da6e8e6':
  adb: make the test_pull_dir test actually test something.

adb/test_device.py

diff --git a/adb/test_device.py b/adb/test_device.py
index 8d75468..955b67a 100644
--- a/adb/test_device.py
+++ b/adb/test_device.py
@@ -819,7 +819,10 @@
             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: