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

Merge "Fix releasetools timeouts" am: 010bbea401

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2530977

Change-Id: I6825928c6bf5d33840544f8a5ea0dacb95fbfc32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kelvin Zhang
2023-04-12 16:10:06 +00:00
committed by Automerger Merge Worker
parent e7937f2c3b 010bbea401
commit d434bd4c02
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/test_common.py
View File

@@ -452,12 +452,14 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
test_file.write(bytes(data)) test_file.write(bytes(data))
test_file.close() test_file.close()
expected_stat = os.stat(test_file_name)
expected_mode = extra_zipwrite_args.get("perms", 0o644) expected_mode = extra_zipwrite_args.get("perms", 0o644)
expected_compress_type = extra_zipwrite_args.get("compress_type", expected_compress_type = extra_zipwrite_args.get("compress_type",
zipfile.ZIP_STORED) zipfile.ZIP_STORED)
time.sleep(5) # Make sure the atime/mtime will change measurably.
# Arbitrary timestamp, just to make sure common.ZipWrite() restores
# the timestamp after writing.
os.utime(test_file_name, (1234567, 1234567))
expected_stat = os.stat(test_file_name)
common.ZipWrite(zip_file, test_file_name, **extra_zipwrite_args) common.ZipWrite(zip_file, test_file_name, **extra_zipwrite_args)
zip_file.close() zip_file.close()
@@ -480,8 +482,6 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
try: try:
expected_compress_type = extra_args.get("compress_type", expected_compress_type = extra_args.get("compress_type",
zipfile.ZIP_STORED) zipfile.ZIP_STORED)
time.sleep(5) # Make sure the atime/mtime will change measurably.
if not isinstance(zinfo_or_arcname, zipfile.ZipInfo): if not isinstance(zinfo_or_arcname, zipfile.ZipInfo):
arcname = zinfo_or_arcname arcname = zinfo_or_arcname
expected_mode = extra_args.get("perms", 0o644) expected_mode = extra_args.get("perms", 0o644)
@@ -528,11 +528,13 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase):
test_file.write(data) test_file.write(data)
test_file.close() test_file.close()
# Arbitrary timestamp, just to make sure common.ZipWrite() restores
# the timestamp after writing.
os.utime(test_file_name, (1234567, 1234567))
expected_stat = os.stat(test_file_name) expected_stat = os.stat(test_file_name)
expected_mode = 0o644 expected_mode = 0o644
expected_compress_type = extra_args.get("compress_type", expected_compress_type = extra_args.get("compress_type",
zipfile.ZIP_STORED) zipfile.ZIP_STORED)
time.sleep(5) # Make sure the atime/mtime will change measurably.
common.ZipWrite(zip_file, test_file_name, **extra_args) common.ZipWrite(zip_file, test_file_name, **extra_args)
common.ZipWriteStr(zip_file, arcname_small, small, **extra_args) common.ZipWriteStr(zip_file, arcname_small, small, **extra_args)