From 4d54d988b5eeeaad445ebdb78233314f0d57b870 Mon Sep 17 00:00:00 2001 From: Pulkit Aggarwal Date: Tue, 28 Oct 2025 10:44:25 +0000 Subject: [PATCH 1/2] fix: flaky system tests for resumable_media --- tests/resumable_media/system/requests/test_download.py | 6 +++++- tests/resumable_media/system/requests/test_upload.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/resumable_media/system/requests/test_download.py b/tests/resumable_media/system/requests/test_download.py index 5417dd7bc..e5eeed729 100644 --- a/tests/resumable_media/system/requests/test_download.py +++ b/tests/resumable_media/system/requests/test_download.py @@ -18,6 +18,7 @@ import http.client import io import os +import sys import google.auth # type: ignore import google.auth.transport.requests as tr_requests # type: ignore @@ -63,7 +64,10 @@ class CorruptingAuthorizedSession(tr_requests.AuthorizedSession): constructor. """ - EMPTY_MD5 = base64.b64encode(hashlib.md5(b"").digest()).decode("utf-8") + if sys.version_info >= (3, 9): + EMPTY_MD5 = base64.b64encode(hashlib.md5(b"", usedforsecurity=False).digest()).decode("utf-8") + else: + EMPTY_MD5 = base64.b64encode(hashlib.md5(b"").digest()).decode("utf-8") crc32c = google_crc32c.Checksum() crc32c.update(b"") EMPTY_CRC32C = base64.b64encode(crc32c.digest()).decode("utf-8") diff --git a/tests/resumable_media/system/requests/test_upload.py b/tests/resumable_media/system/requests/test_upload.py index f9e3b8164..6dae38963 100644 --- a/tests/resumable_media/system/requests/test_upload.py +++ b/tests/resumable_media/system/requests/test_upload.py @@ -18,6 +18,7 @@ import io import os import urllib.parse +import sys import pytest # type: ignore from unittest import mock @@ -73,7 +74,10 @@ def img_stream(): def get_md5(data): - hash_obj = hashlib.md5(data) + if sys.version_info >= (3, 9): + hash_obj = hashlib.md5(data, usedforsecurity=False) + else: + hash_obj = hashlib.md5(data) return base64.b64encode(hash_obj.digest()) From 807baa317cb2361cc04812a31a6897f9d194058d Mon Sep 17 00:00:00 2001 From: Pulkit Aggarwal Date: Tue, 28 Oct 2025 10:52:34 +0000 Subject: [PATCH 2/2] resolving comments --- tests/resumable_media/system/requests/test_download.py | 9 +++++---- tests/resumable_media/system/requests/test_upload.py | 7 +++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/resumable_media/system/requests/test_download.py b/tests/resumable_media/system/requests/test_download.py index e5eeed729..95f80b3c2 100644 --- a/tests/resumable_media/system/requests/test_download.py +++ b/tests/resumable_media/system/requests/test_download.py @@ -64,10 +64,11 @@ class CorruptingAuthorizedSession(tr_requests.AuthorizedSession): constructor. """ - if sys.version_info >= (3, 9): - EMPTY_MD5 = base64.b64encode(hashlib.md5(b"", usedforsecurity=False).digest()).decode("utf-8") - else: - EMPTY_MD5 = base64.b64encode(hashlib.md5(b"").digest()).decode("utf-8") + EMPTY_MD5 = base64.b64encode( + hashlib.md5( + b"", **({"usedforsecurity": False} if sys.version_info >= (3, 9) else {}) + ).digest() + ).decode("utf-8") crc32c = google_crc32c.Checksum() crc32c.update(b"") EMPTY_CRC32C = base64.b64encode(crc32c.digest()).decode("utf-8") diff --git a/tests/resumable_media/system/requests/test_upload.py b/tests/resumable_media/system/requests/test_upload.py index 6dae38963..dd90aa53b 100644 --- a/tests/resumable_media/system/requests/test_upload.py +++ b/tests/resumable_media/system/requests/test_upload.py @@ -74,10 +74,9 @@ def img_stream(): def get_md5(data): - if sys.version_info >= (3, 9): - hash_obj = hashlib.md5(data, usedforsecurity=False) - else: - hash_obj = hashlib.md5(data) + hash_obj = hashlib.md5( + data, **({"usedforsecurity": False} if sys.version_info >= (3, 9) else {}) + ) return base64.b64encode(hash_obj.digest())