summaryrefslogtreecommitdiffstats
path: root/tools/releasetools
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-24 03:25:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-24 03:25:31 +0000
commit30b5e49796ca69fcb15838b0d0cbf740da547b39 (patch)
treee0c2e70e61e4a5924b1078c662b5bb1228e9bc7f /tools/releasetools
parentb5f5bd6e1bd6b31d6eff51aa6a6033064d20b357 (diff)
parent220a0332d318d0dcf7d3611c78084e066ada8e54 (diff)
downloadbuild-30b5e49796ca69fcb15838b0d0cbf740da547b39.zip
build-30b5e49796ca69fcb15838b0d0cbf740da547b39.tar.gz
build-30b5e49796ca69fcb15838b0d0cbf740da547b39.tar.bz2
am 220a0332: am c47f47b7: am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit '220a0332d318d0dcf7d3611c78084e066ada8e54': Run ZipFile.testzip() during zipfile tests.
Diffstat (limited to 'tools/releasetools')
-rw-r--r--tools/releasetools/test_common.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/releasetools/test_common.py b/tools/releasetools/test_common.py
index f163f92..5fdc132 100644
--- a/tools/releasetools/test_common.py
+++ b/tools/releasetools/test_common.py
@@ -62,6 +62,7 @@ class CommonZipTest(unittest.TestCase):
new_stat = os.stat(test_file_name)
self.assertEqual(int(old_stat.st_mode), int(new_stat.st_mode))
self.assertEqual(int(old_stat.st_mtime), int(new_stat.st_mtime))
+ self.assertIsNone(zip_file.testzip())
zip_file.close()
zip_file = zipfile.ZipFile(zip_file_name, "r")
@@ -71,6 +72,7 @@ class CommonZipTest(unittest.TestCase):
mode = (info.external_attr >> 16) & 0o777
self.assertEqual(mode, expected_mode)
self.assertEqual(zip_file.read(arcname), contents)
+ self.assertIsNone(zip_file.testzip())
finally:
os.remove(test_file_name)
os.remove(zip_file_name)