commit 2af2c22690bdcbac82782512e5127b39f2fac1a8
author Elliott Hughes <enh@google.com> Thu Sep 17 03:17:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 17 03:17:27 2015 +0000
tree 0f9273b0ee70aaead75a581b3b45957b4352d5ee
parent 243f7705571df972686988295e24de2e328fa09d
parent ee669bdecbe9fa189d9370bc32571571d4639a52

am 09a0d98b: am 1d758c90: Merge "adb unittest: make test_sync properly cleanup after itself"

* commit '09a0d98bebce23f014ea11af002c1fafaf6b8065':
  adb unittest: make test_sync properly cleanup after itself

adb/test_device.py

diff --git a/adb/test_device.py b/adb/test_device.py
index 4452eed..d033a01 100644
--- a/adb/test_device.py
+++ b/adb/test_device.py
@@ -499,7 +499,8 @@
             self.assertEqual(temp_file.checksum, dev_md5)
 
         self.device.shell(['rm', '-rf', self.DEVICE_TEMP_DIR])
-        shutil.rmtree(base_dir + self.DEVICE_TEMP_DIR)
+        if base_dir is not None:
+            shutil.rmtree(base_dir)
 
     def test_unicode_paths(self):
         """Ensure that we can support non-ASCII paths, even on Windows."""