Remove all ZIP64LIMIT hack
In the old days, we hacked values of ZIP64LIMIT to get around size limitations of non-zip64 supported zip files. Now that we switched to python3 + zip64, there's no point in keeping those hacks. Test: th Bug: 255683436 Change-Id: I913db33dad5503736c68a7a1f1321aa952019f60
This commit is contained in:
Kelvin Zhang
parent
1de1788dda
commit
37a4290909
9 changed files with 67 additions and 101 deletions
|
|
@ -842,14 +842,13 @@ def ReplaceUpdatedFiles(zip_filename, files_list):
|
|||
SYSTEM/ after rebuilding recovery.
|
||||
"""
|
||||
common.ZipDelete(zip_filename, files_list)
|
||||
output_zip = zipfile.ZipFile(zip_filename, "a",
|
||||
with zipfile.ZipFile(zip_filename, "a",
|
||||
compression=zipfile.ZIP_DEFLATED,
|
||||
allowZip64=True)
|
||||
for item in files_list:
|
||||
file_path = os.path.join(OPTIONS.input_tmp, item)
|
||||
assert os.path.exists(file_path)
|
||||
common.ZipWrite(output_zip, file_path, arcname=item)
|
||||
common.ZipClose(output_zip)
|
||||
allowZip64=True) as output_zip:
|
||||
for item in files_list:
|
||||
file_path = os.path.join(OPTIONS.input_tmp, item)
|
||||
assert os.path.exists(file_path)
|
||||
common.ZipWrite(output_zip, file_path, arcname=item)
|
||||
|
||||
|
||||
def HasPartition(partition_name):
|
||||
|
|
@ -1176,7 +1175,7 @@ def AddImagesToTargetFiles(filename):
|
|||
AddVbmetaDigest(output_zip)
|
||||
|
||||
if output_zip:
|
||||
common.ZipClose(output_zip)
|
||||
output_zip.close()
|
||||
if OPTIONS.replace_updated_files_list:
|
||||
ReplaceUpdatedFiles(output_zip.filename,
|
||||
OPTIONS.replace_updated_files_list)
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ def SignUncompressedApex(avbtool, apex_file, payload_key, container_key,
|
|||
apex_zip = zipfile.ZipFile(apex_file, 'a', allowZip64=True)
|
||||
common.ZipWrite(apex_zip, payload_file, arcname=APEX_PAYLOAD_IMAGE)
|
||||
common.ZipWrite(apex_zip, payload_public_key, arcname=APEX_PUBKEY)
|
||||
common.ZipClose(apex_zip)
|
||||
apex_zip.close()
|
||||
|
||||
# 3. Sign the APEX container with container_key.
|
||||
signed_apex = common.MakeTempFile(prefix='apex-container-', suffix='.apex')
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ def VerifyAbOtaPayload(cert, package):
|
|||
"""Verifies the payload and metadata signatures in an A/B OTA payload."""
|
||||
package_zip = zipfile.ZipFile(package, 'r', allowZip64=True)
|
||||
if 'payload.bin' not in package_zip.namelist():
|
||||
common.ZipClose(package_zip)
|
||||
package_zip.close()
|
||||
return
|
||||
|
||||
print('Verifying A/B OTA payload signatures...')
|
||||
|
|
@ -160,7 +160,7 @@ def VerifyAbOtaPayload(cert, package):
|
|||
'--in_file=' + payload_file,
|
||||
'--public_key=' + pubkey]
|
||||
common.RunAndCheckOutput(cmd)
|
||||
common.ZipClose(package_zip)
|
||||
package_zip.close()
|
||||
|
||||
# Verified successfully upon reaching here.
|
||||
print('\nPayload signatures VERIFIED\n\n')
|
||||
|
|
|
|||
|
|
@ -2797,18 +2797,6 @@ class PasswordManager(object):
|
|||
def ZipWrite(zip_file, filename, arcname=None, perms=0o644,
|
||||
compress_type=None):
|
||||
|
||||
# http://b/18015246
|
||||
# Python 2.7's zipfile implementation wrongly thinks that zip64 is required
|
||||
# for files larger than 2GiB. We can work around this by adjusting their
|
||||
# limit. Note that `zipfile.writestr()` will not work for strings larger than
|
||||
# 2GiB. The Python interpreter sometimes rejects strings that large (though
|
||||
# it isn't clear to me exactly what circumstances cause this).
|
||||
# `zipfile.write()` must be used directly to work around this.
|
||||
#
|
||||
# This mess can be avoided if we port to python3.
|
||||
saved_zip64_limit = zipfile.ZIP64_LIMIT
|
||||
zipfile.ZIP64_LIMIT = (1 << 32) - 1
|
||||
|
||||
if compress_type is None:
|
||||
compress_type = zip_file.compression
|
||||
if arcname is None:
|
||||
|
|
@ -2834,14 +2822,13 @@ def ZipWrite(zip_file, filename, arcname=None, perms=0o644,
|
|||
finally:
|
||||
os.chmod(filename, saved_stat.st_mode)
|
||||
os.utime(filename, (saved_stat.st_atime, saved_stat.st_mtime))
|
||||
zipfile.ZIP64_LIMIT = saved_zip64_limit
|
||||
|
||||
|
||||
def ZipWriteStr(zip_file, zinfo_or_arcname, data, perms=None,
|
||||
compress_type=None):
|
||||
"""Wrap zipfile.writestr() function to work around the zip64 limit.
|
||||
|
||||
Even with the ZIP64_LIMIT workaround, it won't allow writing a string
|
||||
Python's zip implementation won't allow writing a string
|
||||
longer than 2GiB. It gives 'OverflowError: size does not fit in an int'
|
||||
when calling crc32(bytes).
|
||||
|
||||
|
|
@ -2850,9 +2837,6 @@ def ZipWriteStr(zip_file, zinfo_or_arcname, data, perms=None,
|
|||
when we know the string won't be too long.
|
||||
"""
|
||||
|
||||
saved_zip64_limit = zipfile.ZIP64_LIMIT
|
||||
zipfile.ZIP64_LIMIT = (1 << 32) - 1
|
||||
|
||||
if not isinstance(zinfo_or_arcname, zipfile.ZipInfo):
|
||||
zinfo = zipfile.ZipInfo(filename=zinfo_or_arcname)
|
||||
zinfo.compress_type = zip_file.compression
|
||||
|
|
@ -2885,7 +2869,6 @@ def ZipWriteStr(zip_file, zinfo_or_arcname, data, perms=None,
|
|||
zinfo.date_time = (2009, 1, 1, 0, 0, 0)
|
||||
|
||||
zip_file.writestr(zinfo, data)
|
||||
zipfile.ZIP64_LIMIT = saved_zip64_limit
|
||||
|
||||
|
||||
def ZipDelete(zip_filename, entries, force=False):
|
||||
|
|
@ -2919,18 +2902,6 @@ def ZipDelete(zip_filename, entries, force=False):
|
|||
os.replace(new_zipfile, zip_filename)
|
||||
|
||||
|
||||
def ZipClose(zip_file):
|
||||
# http://b/18015246
|
||||
# zipfile also refers to ZIP64_LIMIT during close() when it writes out the
|
||||
# central directory.
|
||||
saved_zip64_limit = zipfile.ZIP64_LIMIT
|
||||
zipfile.ZIP64_LIMIT = (1 << 32) - 1
|
||||
|
||||
zip_file.close()
|
||||
|
||||
zipfile.ZIP64_LIMIT = saved_zip64_limit
|
||||
|
||||
|
||||
class DeviceSpecificParams(object):
|
||||
module = None
|
||||
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ endif;
|
|||
|
||||
# We haven't written the metadata entry, which will be done in
|
||||
# FinalizeMetadata.
|
||||
common.ZipClose(output_zip)
|
||||
output_zip.close()
|
||||
|
||||
needed_property_files = (
|
||||
NonAbOtaPropertyFiles(),
|
||||
|
|
@ -531,7 +531,7 @@ endif;
|
|||
|
||||
# We haven't written the metadata entry yet, which will be handled in
|
||||
# FinalizeMetadata().
|
||||
common.ZipClose(output_zip)
|
||||
output_zip.close()
|
||||
|
||||
# Sign the generated zip package unless no_signing is specified.
|
||||
needed_property_files = (
|
||||
|
|
|
|||
|
|
@ -487,7 +487,7 @@ def GetTargetFilesZipForSecondaryImages(input_file, skip_postinstall=False):
|
|||
else:
|
||||
common.ZipWrite(target_zip, unzipped_file, arcname=info.filename)
|
||||
|
||||
common.ZipClose(target_zip)
|
||||
target_zip.close()
|
||||
|
||||
return target_file
|
||||
|
||||
|
|
@ -624,7 +624,7 @@ def GetTargetFilesZipForPartialUpdates(input_file, ab_partitions):
|
|||
|
||||
# TODO(xunchang) handle META/postinstall_config.txt'
|
||||
|
||||
common.ZipClose(partial_target_zip)
|
||||
partial_target_zip.close()
|
||||
|
||||
return partial_target_file
|
||||
|
||||
|
|
@ -709,7 +709,7 @@ def GetTargetFilesZipForRetrofitDynamicPartitions(input_file,
|
|||
# Write new ab_partitions.txt file
|
||||
common.ZipWrite(target_zip, new_ab_partitions, arcname=AB_PARTITIONS)
|
||||
|
||||
common.ZipClose(target_zip)
|
||||
target_zip.close()
|
||||
|
||||
return target_file
|
||||
|
||||
|
|
@ -1017,11 +1017,11 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
|
|||
common.ZipWriteStr(output_zip, "apex_info.pb", ota_apex_info,
|
||||
compress_type=zipfile.ZIP_STORED)
|
||||
|
||||
common.ZipClose(target_zip)
|
||||
target_zip.close()
|
||||
|
||||
# We haven't written the metadata entry yet, which will be handled in
|
||||
# FinalizeMetadata().
|
||||
common.ZipClose(output_zip)
|
||||
output_zip.close()
|
||||
|
||||
FinalizeMetadata(metadata, staging_file, output_file,
|
||||
package_key=OPTIONS.package_key)
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import zipfile
|
|||
|
||||
import ota_metadata_pb2
|
||||
import common
|
||||
from common import (ZipDelete, ZipClose, OPTIONS, MakeTempFile,
|
||||
from common import (ZipDelete, OPTIONS, MakeTempFile,
|
||||
ZipWriteStr, BuildInfo, LoadDictionaryFromFile,
|
||||
SignFile, PARTITIONS_WITH_BUILD_PROP, PartitionBuildProps,
|
||||
GetRamdiskFormat)
|
||||
|
|
|
|||
|
|
@ -901,7 +901,7 @@ def WriteOtacerts(output_zip, filename, keys):
|
|||
certs_zip = zipfile.ZipFile(temp_file, "w", allowZip64=True)
|
||||
for k in keys:
|
||||
common.ZipWrite(certs_zip, k)
|
||||
common.ZipClose(certs_zip)
|
||||
certs_zip.close()
|
||||
common.ZipWriteStr(output_zip, filename, temp_file.getvalue())
|
||||
|
||||
|
||||
|
|
@ -1529,8 +1529,8 @@ def main(argv):
|
|||
platform_api_level, codename_to_api_level_map,
|
||||
compressed_extension)
|
||||
|
||||
common.ZipClose(input_zip)
|
||||
common.ZipClose(output_zip)
|
||||
input_zip.close()
|
||||
output_zip.close()
|
||||
|
||||
if OPTIONS.vendor_partitions and OPTIONS.vendor_otatools:
|
||||
BuildVendorPartitions(args[1])
|
||||
|
|
|
|||
|
|
@ -222,17 +222,17 @@ class BuildInfoTest(test_utils.ReleaseToolsTestCase):
|
|||
info_dict = copy.deepcopy(self.TEST_INFO_FINGERPRINT_DICT)
|
||||
build_info = common.BuildInfo(info_dict)
|
||||
self.assertEqual(
|
||||
'product-brand/product-name/product-device:version-release/build-id/'
|
||||
'version-incremental:build-type/build-tags', build_info.fingerprint)
|
||||
'product-brand/product-name/product-device:version-release/build-id/'
|
||||
'version-incremental:build-type/build-tags', build_info.fingerprint)
|
||||
|
||||
build_props = info_dict['build.prop'].build_props
|
||||
del build_props['ro.build.id']
|
||||
build_props['ro.build.legacy.id'] = 'legacy-build-id'
|
||||
build_info = common.BuildInfo(info_dict, use_legacy_id=True)
|
||||
self.assertEqual(
|
||||
'product-brand/product-name/product-device:version-release/'
|
||||
'legacy-build-id/version-incremental:build-type/build-tags',
|
||||
build_info.fingerprint)
|
||||
'product-brand/product-name/product-device:version-release/'
|
||||
'legacy-build-id/version-incremental:build-type/build-tags',
|
||||
build_info.fingerprint)
|
||||
|
||||
self.assertRaises(common.ExternalError, common.BuildInfo, info_dict, None,
|
||||
False)
|
||||
|
|
@ -241,9 +241,9 @@ class BuildInfoTest(test_utils.ReleaseToolsTestCase):
|
|||
info_dict['vbmeta_digest'] = 'abcde12345'
|
||||
build_info = common.BuildInfo(info_dict, use_legacy_id=False)
|
||||
self.assertEqual(
|
||||
'product-brand/product-name/product-device:version-release/'
|
||||
'legacy-build-id.abcde123/version-incremental:build-type/build-tags',
|
||||
build_info.fingerprint)
|
||||
'product-brand/product-name/product-device:version-release/'
|
||||
'legacy-build-id.abcde123/version-incremental:build-type/build-tags',
|
||||
build_info.fingerprint)
|
||||
|
||||
def test___getitem__(self):
|
||||
target_info = common.BuildInfo(self.TEST_INFO_DICT, None)
|
||||
|
|
@ -376,7 +376,7 @@ class BuildInfoTest(test_utils.ReleaseToolsTestCase):
|
|||
info_dict['build.prop'].build_props[
|
||||
'ro.product.property_source_order'] = 'bad-source'
|
||||
with self.assertRaisesRegexp(common.ExternalError,
|
||||
'Invalid ro.product.property_source_order'):
|
||||
'Invalid ro.product.property_source_order'):
|
||||
info = common.BuildInfo(info_dict, None)
|
||||
info.GetBuildProp('ro.product.device')
|
||||
|
||||
|
|
@ -459,7 +459,7 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
time.sleep(5) # Make sure the atime/mtime will change measurably.
|
||||
|
||||
common.ZipWrite(zip_file, test_file_name, **extra_zipwrite_args)
|
||||
common.ZipClose(zip_file)
|
||||
zip_file.close()
|
||||
|
||||
self._verify(zip_file, zip_file_name, arcname, sha1_hash.hexdigest(),
|
||||
test_file_name, expected_stat, expected_mode,
|
||||
|
|
@ -494,7 +494,7 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
expected_mode = extra_args.get("perms", zinfo_perms)
|
||||
|
||||
common.ZipWriteStr(zip_file, zinfo_or_arcname, contents, **extra_args)
|
||||
common.ZipClose(zip_file)
|
||||
zip_file.close()
|
||||
|
||||
self._verify(zip_file, zip_file_name, arcname, sha1(contents).hexdigest(),
|
||||
expected_mode=expected_mode,
|
||||
|
|
@ -536,7 +536,7 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
|
||||
common.ZipWrite(zip_file, test_file_name, **extra_args)
|
||||
common.ZipWriteStr(zip_file, arcname_small, small, **extra_args)
|
||||
common.ZipClose(zip_file)
|
||||
zip_file.close()
|
||||
|
||||
# Verify the contents written by ZipWrite().
|
||||
self._verify(zip_file, zip_file_name, arcname_large,
|
||||
|
|
@ -551,12 +551,6 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
os.remove(zip_file_name)
|
||||
os.remove(test_file_name)
|
||||
|
||||
def _test_reset_ZIP64_LIMIT(self, func, *args):
|
||||
default_limit = (1 << 31) - 1
|
||||
self.assertEqual(default_limit, zipfile.ZIP64_LIMIT)
|
||||
func(*args)
|
||||
self.assertEqual(default_limit, zipfile.ZIP64_LIMIT)
|
||||
|
||||
def test_ZipWrite(self):
|
||||
file_contents = os.urandom(1024)
|
||||
self._test_ZipWrite(file_contents)
|
||||
|
|
@ -581,7 +575,7 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
})
|
||||
|
||||
def test_ZipWrite_resets_ZIP64_LIMIT(self):
|
||||
self._test_reset_ZIP64_LIMIT(self._test_ZipWrite, "")
|
||||
self._test_ZipWrite("")
|
||||
|
||||
def test_ZipWriteStr(self):
|
||||
random_string = os.urandom(1024)
|
||||
|
|
@ -632,9 +626,9 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
})
|
||||
|
||||
def test_ZipWriteStr_resets_ZIP64_LIMIT(self):
|
||||
self._test_reset_ZIP64_LIMIT(self._test_ZipWriteStr, 'foo', b'')
|
||||
self._test_ZipWriteStr('foo', b'')
|
||||
zinfo = zipfile.ZipInfo(filename="foo")
|
||||
self._test_reset_ZIP64_LIMIT(self._test_ZipWriteStr, zinfo, b'')
|
||||
self._test_ZipWriteStr(zinfo, b'')
|
||||
|
||||
def test_bug21309935(self):
|
||||
zip_file = tempfile.NamedTemporaryFile(delete=False)
|
||||
|
|
@ -656,7 +650,7 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
zinfo = zipfile.ZipInfo(filename="qux")
|
||||
zinfo.external_attr = 0o700 << 16
|
||||
common.ZipWriteStr(zip_file, zinfo, random_string, perms=0o400)
|
||||
common.ZipClose(zip_file)
|
||||
zip_file.close()
|
||||
|
||||
self._verify(zip_file, zip_file_name, "foo",
|
||||
sha1(random_string).hexdigest(),
|
||||
|
|
@ -683,7 +677,7 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
common.ZipWrite(output_zip, entry_file.name, arcname='Test1')
|
||||
common.ZipWrite(output_zip, entry_file.name, arcname='Test2')
|
||||
common.ZipWrite(output_zip, entry_file.name, arcname='Test3')
|
||||
common.ZipClose(output_zip)
|
||||
output_zip.close()
|
||||
zip_file.close()
|
||||
|
||||
try:
|
||||
|
|
@ -731,8 +725,8 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
|
|||
common.ZipWrite(output_zip, entry_file.name, arcname='Foo3')
|
||||
common.ZipWrite(output_zip, entry_file.name, arcname='Bar4')
|
||||
common.ZipWrite(output_zip, entry_file.name, arcname='Dir5/Baz5')
|
||||
common.ZipClose(output_zip)
|
||||
common.ZipClose(output_zip)
|
||||
output_zip.close()
|
||||
output_zip.close()
|
||||
return zip_file
|
||||
|
||||
@test_utils.SkipIfExternalToolsUnavailable()
|
||||
|
|
@ -819,9 +813,9 @@ class CommonApkUtilsTest(test_utils.ReleaseToolsTestCase):
|
|||
)
|
||||
|
||||
APKCERTS_CERTMAP1 = {
|
||||
'RecoveryLocalizer.apk' : 'certs/devkey',
|
||||
'Settings.apk' : 'build/make/target/product/security/platform',
|
||||
'TV.apk' : 'PRESIGNED',
|
||||
'RecoveryLocalizer.apk': 'certs/devkey',
|
||||
'Settings.apk': 'build/make/target/product/security/platform',
|
||||
'TV.apk': 'PRESIGNED',
|
||||
}
|
||||
|
||||
APKCERTS_TXT2 = (
|
||||
|
|
@ -836,10 +830,10 @@ class CommonApkUtilsTest(test_utils.ReleaseToolsTestCase):
|
|||
)
|
||||
|
||||
APKCERTS_CERTMAP2 = {
|
||||
'Compressed1.apk' : 'certs/compressed1',
|
||||
'Compressed2a.apk' : 'certs/compressed2',
|
||||
'Compressed2b.apk' : 'certs/compressed2',
|
||||
'Compressed3.apk' : 'certs/compressed3',
|
||||
'Compressed1.apk': 'certs/compressed1',
|
||||
'Compressed2a.apk': 'certs/compressed2',
|
||||
'Compressed2b.apk': 'certs/compressed2',
|
||||
'Compressed3.apk': 'certs/compressed3',
|
||||
}
|
||||
|
||||
APKCERTS_TXT3 = (
|
||||
|
|
@ -848,7 +842,7 @@ class CommonApkUtilsTest(test_utils.ReleaseToolsTestCase):
|
|||
)
|
||||
|
||||
APKCERTS_CERTMAP3 = {
|
||||
'Compressed4.apk' : 'certs/compressed4',
|
||||
'Compressed4.apk': 'certs/compressed4',
|
||||
}
|
||||
|
||||
# Test parsing with no optional fields, both optional fields, and only the
|
||||
|
|
@ -865,9 +859,9 @@ class CommonApkUtilsTest(test_utils.ReleaseToolsTestCase):
|
|||
)
|
||||
|
||||
APKCERTS_CERTMAP4 = {
|
||||
'RecoveryLocalizer.apk' : 'certs/devkey',
|
||||
'Settings.apk' : 'build/make/target/product/security/platform',
|
||||
'TV.apk' : 'PRESIGNED',
|
||||
'RecoveryLocalizer.apk': 'certs/devkey',
|
||||
'Settings.apk': 'build/make/target/product/security/platform',
|
||||
'TV.apk': 'PRESIGNED',
|
||||
}
|
||||
|
||||
def setUp(self):
|
||||
|
|
@ -971,7 +965,7 @@ class CommonApkUtilsTest(test_utils.ReleaseToolsTestCase):
|
|||
extracted_from_privkey = common.ExtractAvbPublicKey('avbtool', privkey)
|
||||
extracted_from_pubkey = common.ExtractAvbPublicKey('avbtool', pubkey)
|
||||
with open(extracted_from_privkey, 'rb') as privkey_fp, \
|
||||
open(extracted_from_pubkey, 'rb') as pubkey_fp:
|
||||
open(extracted_from_pubkey, 'rb') as pubkey_fp:
|
||||
self.assertEqual(privkey_fp.read(), pubkey_fp.read())
|
||||
|
||||
def test_ParseCertificate(self):
|
||||
|
|
@ -1235,7 +1229,8 @@ class CommonUtilsTest(test_utils.ReleaseToolsTestCase):
|
|||
self.assertEqual(
|
||||
'1-5 9-10',
|
||||
sparse_image.file_map['//system/file1'].extra['text_str'])
|
||||
self.assertTrue(sparse_image.file_map['//system/file2'].extra['incomplete'])
|
||||
self.assertTrue(
|
||||
sparse_image.file_map['//system/file2'].extra['incomplete'])
|
||||
self.assertTrue(
|
||||
sparse_image.file_map['/system/app/file3'].extra['incomplete'])
|
||||
|
||||
|
|
@ -1343,7 +1338,7 @@ class CommonUtilsTest(test_utils.ReleaseToolsTestCase):
|
|||
'recovery_api_version': 3,
|
||||
'fstab_version': 2,
|
||||
'system_root_image': 'true',
|
||||
'no_recovery' : 'true',
|
||||
'no_recovery': 'true',
|
||||
'recovery_as_boot': 'true',
|
||||
}
|
||||
|
||||
|
|
@ -1664,6 +1659,7 @@ class CommonUtilsTest(test_utils.ReleaseToolsTestCase):
|
|||
self.assertRaises(common.ExternalError, common._GenerateGkiCertificate,
|
||||
test_file.name, 'generic_kernel')
|
||||
|
||||
|
||||
class InstallRecoveryScriptFormatTest(test_utils.ReleaseToolsTestCase):
|
||||
"""Checks the format of install-recovery.sh.
|
||||
|
||||
|
|
@ -1673,7 +1669,7 @@ class InstallRecoveryScriptFormatTest(test_utils.ReleaseToolsTestCase):
|
|||
def setUp(self):
|
||||
self._tempdir = common.MakeTempDir()
|
||||
# Create a fake dict that contains the fstab info for boot&recovery.
|
||||
self._info = {"fstab" : {}}
|
||||
self._info = {"fstab": {}}
|
||||
fake_fstab = [
|
||||
"/dev/soc.0/by-name/boot /boot emmc defaults defaults",
|
||||
"/dev/soc.0/by-name/recovery /recovery emmc defaults defaults"]
|
||||
|
|
@ -2020,11 +2016,11 @@ class PartitionBuildPropsTest(test_utils.ReleaseToolsTestCase):
|
|||
input_zip, 'odm', placeholder_values)
|
||||
|
||||
self.assertEqual({
|
||||
'ro.odm.build.date.utc': '1578430045',
|
||||
'ro.odm.build.fingerprint':
|
||||
'google/coral/coral:10/RP1A.200325.001/6337676:user/dev-keys',
|
||||
'ro.product.odm.device': 'coral',
|
||||
'ro.product.odm.name': 'product1',
|
||||
'ro.odm.build.date.utc': '1578430045',
|
||||
'ro.odm.build.fingerprint':
|
||||
'google/coral/coral:10/RP1A.200325.001/6337676:user/dev-keys',
|
||||
'ro.product.odm.device': 'coral',
|
||||
'ro.product.odm.name': 'product1',
|
||||
}, partition_props.build_props)
|
||||
|
||||
with zipfile.ZipFile(input_file, 'r', allowZip64=True) as input_zip:
|
||||
|
|
@ -2207,8 +2203,8 @@ class PartitionBuildPropsTest(test_utils.ReleaseToolsTestCase):
|
|||
|
||||
copied_props = copy.deepcopy(partition_props)
|
||||
self.assertEqual({
|
||||
'ro.odm.build.date.utc': '1578430045',
|
||||
'ro.odm.build.fingerprint':
|
||||
'google/coral/coral:10/RP1A.200325.001/6337676:user/dev-keys',
|
||||
'ro.product.odm.device': 'coral',
|
||||
'ro.odm.build.date.utc': '1578430045',
|
||||
'ro.odm.build.fingerprint':
|
||||
'google/coral/coral:10/RP1A.200325.001/6337676:user/dev-keys',
|
||||
'ro.product.odm.device': 'coral',
|
||||
}, copied_props.build_props)
|
||||
|
|
|
|||
Loading…
Reference in a new issue