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
This commit is contained in:
Elliott Hughes 2015-09-17 03:17:27 +00:00 committed by Android Git Automerger
commit 8057b81e22
1 changed files with 2 additions and 1 deletions

View File

@ -499,7 +499,8 @@ class FileOperationsTest(DeviceTest):
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."""