diff options
| author | Yifan Hong <elsk@google.com> | 2019-04-10 17:20:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-10 17:20:06 +0000 |
| commit | 3f8c09f8a5083da966914373cf4b4e78f9ecca3f (patch) | |
| tree | 15209763959be4e8e404819521a790439757971e | |
| parent | 7b136fae8c98809bd6073b674a4bcbfeeda2ecc4 (diff) | |
| parent | 6f3eaeb84d610dbcbe0a677fb90ae2252bc56624 (diff) | |
| download | build-android-q-preview-2.5.tar.gz | |
Merge "Fix DataImage.ReadRangeSet()"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5
| -rw-r--r-- | tools/releasetools/blockimgdiff.py | 2 | ||||
| -rw-r--r-- | tools/releasetools/test_blockimgdiff.py | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py index e5a9050b10..b7c33f54be 100644 --- a/tools/releasetools/blockimgdiff.py +++ b/tools/releasetools/blockimgdiff.py @@ -174,7 +174,7 @@ class DataImage(Image): return h.hexdigest() def ReadRangeSet(self, ranges): - return [self._GetRangeData(ranges)] + return list(self._GetRangeData(ranges)) def TotalSha1(self, include_clobbered_blocks=False): if not include_clobbered_blocks: diff --git a/tools/releasetools/test_blockimgdiff.py b/tools/releasetools/test_blockimgdiff.py index 806ff4b95a..1aabaa2162 100644 --- a/tools/releasetools/test_blockimgdiff.py +++ b/tools/releasetools/test_blockimgdiff.py @@ -16,7 +16,7 @@ import common from blockimgdiff import ( - BlockImageDiff, EmptyImage, HeapItem, ImgdiffStats, Transfer) + BlockImageDiff, DataImage, EmptyImage, HeapItem, ImgdiffStats, Transfer) from rangelib import RangeSet from test_utils import ReleaseToolsTestCase @@ -261,3 +261,10 @@ class ImgdiffStatsTest(ReleaseToolsTestCase): self.assertRaises(AssertionError, imgdiff_stats.Log, "/system/app/app1.apk", "invalid reason") + + +class DataImageTest(ReleaseToolsTestCase): + def test_read_range_set(self): + data = "file" + ('\0' * 4092) + image = DataImage(data) + self.assertEqual(data, "".join(image.ReadRangeSet(image.care_map))) |