tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "releasetools: Fix releasetools_py3_test." am: ae3a9a138d

Browse source 
am: fa4ea59837

Change-Id: Ic9e91053ccb2347dfb0c218fd268beb380933b39
This commit is contained in:
Tao Bao 2019-10-07 12:32:51 -07:00 committed by android-build-merger
commit 4bdfb36549
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/releasetools/test_check_target_files_vintf.py
View file

@ -78,6 +78,8 @@ class CheckTargetFilesVintfTest(test_utils.ReleaseToolsTestCase):
for root, _, files in os.walk(test_delta_dir): for root, _, files in os.walk(test_delta_dir):
rel_root = os.path.relpath(root, test_delta_dir) rel_root = os.path.relpath(root, test_delta_dir)
for f in files: for f in files:
if not f.endswith('.xml'):
continue
output_file = os.path.join(test_dir, rel_root, f) output_file = os.path.join(test_dir, rel_root, f)
with open(os.path.join(root, f)) as inp: with open(os.path.join(root, f)) as inp:
write_string_to_file(inp.read(), output_file) write_string_to_file(inp.read(), output_file)

6
tools/releasetools/test_ota_from_target_files.py
View file

@ -596,7 +596,7 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
with zipfile.ZipFile(target_file) as verify_zip: with zipfile.ZipFile(target_file) as verify_zip:
namelist = verify_zip.namelist() namelist = verify_zip.namelist()
ab_partitions = verify_zip.read('META/ab_partitions.txt') ab_partitions = verify_zip.read('META/ab_partitions.txt').decode()
self.assertIn('META/ab_partitions.txt', namelist) self.assertIn('META/ab_partitions.txt', namelist)
self.assertIn('IMAGES/system.img', namelist) self.assertIn('IMAGES/system.img', namelist)
@ -676,9 +676,9 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
with zipfile.ZipFile(target_file) as verify_zip: with zipfile.ZipFile(target_file) as verify_zip:
namelist = verify_zip.namelist() namelist = verify_zip.namelist()
updated_misc_info = verify_zip.read('META/misc_info.txt') updated_misc_info = verify_zip.read('META/misc_info.txt').decode()
updated_dynamic_partitions_info = verify_zip.read( updated_dynamic_partitions_info = verify_zip.read(
'META/dynamic_partitions_info.txt') 'META/dynamic_partitions_info.txt').decode()
self.assertIn('META/ab_partitions.txt', namelist) self.assertIn('META/ab_partitions.txt', namelist)
self.assertIn('IMAGES/system.img', namelist) self.assertIn('IMAGES/system.img', namelist)