StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

releasetools: Make blockimgdiff Python 3 compatible.

Browse Source 
Bug: 131631303
Test: `python -m unittest test_blockimgdiff`
Test: `python3 -m unittest test_blockimgdiff`
Change-Id: I8cf072ca4af6a525bc675cba0be998ff7be7f4f1
This commit is contained in:
Tao Bao
2019-06-19 14:15:34 -07:00
parent 1f1aafa30d
commit b813120af1
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/test_blockimgdiff.py
View File

@@ -268,6 +268,7 @@ class ImgdiffStatsTest(ReleaseToolsTestCase):
class DataImageTest(ReleaseToolsTestCase):
def test_read_range_set(self):
data = "file" + ('\0' * 4092)
image = DataImage(data)
@@ -275,10 +276,11 @@ class DataImageTest(ReleaseToolsTestCase):
class FileImageTest(ReleaseToolsTestCase):
def setUp(self):
self.file_path = common.MakeTempFile()
self.data = os.urandom(4096 * 4)
with open(self.file_path, 'w') as f:
with open(self.file_path, 'wb') as f:
f.write(self.data)
self.file = FileImage(self.file_path)
@@ -292,18 +294,18 @@ class FileImageTest(ReleaseToolsTestCase):
expected_data = self.data[s * blocksize : e * blocksize]
rs = RangeSet([s, e])
data = "".join(self.file.ReadRangeSet(rs))
data = b''.join(self.file.ReadRangeSet(rs))
self.assertEqual(expected_data, data)
sha1sum = self.file.RangeSha1(rs)
self.assertEqual(sha1(expected_data).hexdigest(), sha1sum)
tmpfile = common.MakeTempFile()
with open(tmpfile, 'w') as f:
with open(tmpfile, 'wb') as f:
self.file.WriteRangeDataToFd(rs, f)
with open(tmpfile, 'r') as f:
with open(tmpfile, 'rb') as f:
self.assertEqual(expected_data, f.read())
def test_read_all(self):
data = "".join(self.file.ReadRangeSet(self.file.care_map))
data = b''.join(self.file.ReadRangeSet(self.file.care_map))
self.assertEqual(self.data, data)