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

Commit 6c5f1c32 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fix releasetools timeouts" am: 010bbea4 am: d434bd4c 

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



Change-Id: I6c8c2360e17434139d2f0beffe5c0af807e9595d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82bf15a9 d434bd4c

tools/releasetools/test_common.py

+7 −5
Original line number Diff line number Diff line
@@ -452,12 +452,14 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase): 
        test_file.write(bytes(data))

      test_file.close()



      expected_stat = os.stat(test_file_name)

      expected_mode = extra_zipwrite_args.get("perms", 0o644)

      expected_compress_type = extra_zipwrite_args.get("compress_type",

                                                       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)

      zip_file.close()
@@ -480,8 +482,6 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase): 
    try:

      expected_compress_type = extra_args.get("compress_type",

                                              zipfile.ZIP_STORED)

      time.sleep(5)  # Make sure the atime/mtime will change measurably.



      if not isinstance(zinfo_or_arcname, zipfile.ZipInfo):

        arcname = zinfo_or_arcname

        expected_mode = extra_args.get("perms", 0o644)
@@ -528,11 +528,13 @@ class CommonZipTest(test_utils.ReleaseToolsTestCase): 
        test_file.write(data)

      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_mode = 0o644

      expected_compress_type = extra_args.get("compress_type",

                                              zipfile.ZIP_STORED)

      time.sleep(5)  # Make sure the atime/mtime will change measurably.



      common.ZipWrite(zip_file, test_file_name, **extra_args)

      common.ZipWriteStr(zip_file, arcname_small, small, **extra_args)