Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f3eaeb8 authored by Yifan Hong's avatar Yifan Hong
Browse files

Fix DataImage.ReadRangeSet() 

It returns a list of one generator object, not a list
of strings.

Test: test_blockimgdiff
Change-Id: I8962c539c2ce3fae90d428b38c4b0e52c5a2cdad
parent d7d6e9d6

tools/releasetools/blockimgdiff.py

+1 −1
Original line number Diff line number Diff line
@@ -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:

tools/releasetools/test_blockimgdiff.py

+8 −1
Original line number Diff line number Diff line
@@ -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)))