@@ -48,13 +48,15 @@ def _create_signed_list_blobs_url_helper(
4848 assert response .status_code == 200
4949
5050
51- def test_create_signed_list_blobs_url_v2 (storage_client , signing_bucket ):
51+ def test_create_signed_list_blobs_url_v2 (storage_client , signing_bucket , no_mtls ):
5252 _create_signed_list_blobs_url_helper (
5353 storage_client , signing_bucket , version = "v2" ,
5454 )
5555
5656
57- def test_create_signed_list_blobs_url_v2_w_expiration (storage_client , signing_bucket ):
57+ def test_create_signed_list_blobs_url_v2_w_expiration (
58+ storage_client , signing_bucket , no_mtls
59+ ):
5860 now = datetime .datetime .utcnow ()
5961 delta = datetime .timedelta (seconds = 10 )
6062
@@ -63,13 +65,15 @@ def test_create_signed_list_blobs_url_v2_w_expiration(storage_client, signing_bu
6365 )
6466
6567
66- def test_create_signed_list_blobs_url_v4 (storage_client , signing_bucket ):
68+ def test_create_signed_list_blobs_url_v4 (storage_client , signing_bucket , no_mtls ):
6769 _create_signed_list_blobs_url_helper (
6870 storage_client , signing_bucket , version = "v4" ,
6971 )
7072
7173
72- def test_create_signed_list_blobs_url_v4_w_expiration (storage_client , signing_bucket ):
74+ def test_create_signed_list_blobs_url_v4_w_expiration (
75+ storage_client , signing_bucket , no_mtls
76+ ):
7377 now = datetime .datetime .utcnow ()
7478 delta = datetime .timedelta (seconds = 10 )
7579 _create_signed_list_blobs_url_helper (
@@ -125,17 +129,19 @@ def _create_signed_read_url_helper(
125129 assert response .content == _helpers .signing_blob_content
126130
127131
128- def test_create_signed_read_url_v2 (storage_client , signing_bucket ):
132+ def test_create_signed_read_url_v2 (storage_client , signing_bucket , no_mtls ):
129133 _create_signed_read_url_helper (storage_client , signing_bucket )
130134
131135
132- def test_create_signed_read_url_v4 (storage_client , signing_bucket ):
136+ def test_create_signed_read_url_v4 (storage_client , signing_bucket , no_mtls ):
133137 _create_signed_read_url_helper (
134138 storage_client , signing_bucket , version = "v4" ,
135139 )
136140
137141
138- def test_create_signed_read_url_v2_w_expiration (storage_client , signing_bucket ):
142+ def test_create_signed_read_url_v2_w_expiration (
143+ storage_client , signing_bucket , no_mtls
144+ ):
139145 now = datetime .datetime .utcnow ()
140146 delta = datetime .timedelta (seconds = 10 )
141147
@@ -144,25 +150,33 @@ def test_create_signed_read_url_v2_w_expiration(storage_client, signing_bucket):
144150 )
145151
146152
147- def test_create_signed_read_url_v4_w_expiration (storage_client , signing_bucket ):
153+ def test_create_signed_read_url_v4_w_expiration (
154+ storage_client , signing_bucket , no_mtls
155+ ):
148156 now = datetime .datetime .utcnow ()
149157 delta = datetime .timedelta (seconds = 10 )
150158 _create_signed_read_url_helper (
151159 storage_client , signing_bucket , expiration = now + delta , version = "v4"
152160 )
153161
154162
155- def test_create_signed_read_url_v2_lowercase_method (storage_client , signing_bucket ):
163+ def test_create_signed_read_url_v2_lowercase_method (
164+ storage_client , signing_bucket , no_mtls
165+ ):
156166 _create_signed_read_url_helper (storage_client , signing_bucket , method = "get" )
157167
158168
159- def test_create_signed_read_url_v4_lowercase_method (storage_client , signing_bucket ):
169+ def test_create_signed_read_url_v4_lowercase_method (
170+ storage_client , signing_bucket , no_mtls
171+ ):
160172 _create_signed_read_url_helper (
161173 storage_client , signing_bucket , method = "get" , version = "v4"
162174 )
163175
164176
165- def test_create_signed_read_url_v2_w_non_ascii_name (storage_client , signing_bucket ):
177+ def test_create_signed_read_url_v2_w_non_ascii_name (
178+ storage_client , signing_bucket , no_mtls
179+ ):
166180 _create_signed_read_url_helper (
167181 storage_client ,
168182 signing_bucket ,
@@ -171,7 +185,9 @@ def test_create_signed_read_url_v2_w_non_ascii_name(storage_client, signing_buck
171185 )
172186
173187
174- def test_create_signed_read_url_v4_w_non_ascii_name (storage_client , signing_bucket ):
188+ def test_create_signed_read_url_v4_w_non_ascii_name (
189+ storage_client , signing_bucket , no_mtls
190+ ):
175191 _create_signed_read_url_helper (
176192 storage_client ,
177193 signing_bucket ,
@@ -181,7 +197,7 @@ def test_create_signed_read_url_v4_w_non_ascii_name(storage_client, signing_buck
181197 )
182198
183199
184- def test_create_signed_read_url_v2_w_csek (storage_client , signing_bucket ):
200+ def test_create_signed_read_url_v2_w_csek (storage_client , signing_bucket , no_mtls ):
185201 encryption_key = os .urandom (32 )
186202 _create_signed_read_url_helper (
187203 storage_client ,
@@ -192,7 +208,7 @@ def test_create_signed_read_url_v2_w_csek(storage_client, signing_bucket):
192208 )
193209
194210
195- def test_create_signed_read_url_v4_w_csek (storage_client , signing_bucket ):
211+ def test_create_signed_read_url_v4_w_csek (storage_client , signing_bucket , no_mtls ):
196212 encryption_key = os .urandom (32 )
197213 _create_signed_read_url_helper (
198214 storage_client ,
@@ -205,7 +221,7 @@ def test_create_signed_read_url_v4_w_csek(storage_client, signing_bucket):
205221
206222
207223def test_create_signed_read_url_v2_w_access_token (
208- storage_client , signing_bucket , service_account ,
224+ storage_client , signing_bucket , service_account , no_mtls
209225):
210226 client = iam_credentials_v1 .IAMCredentialsClient ()
211227 service_account_email = service_account .service_account_email
@@ -229,7 +245,7 @@ def test_create_signed_read_url_v2_w_access_token(
229245
230246
231247def test_create_signed_read_url_v4_w_access_token (
232- storage_client , signing_bucket , service_account ,
248+ storage_client , signing_bucket , service_account , no_mtls
233249):
234250 client = iam_credentials_v1 .IAMCredentialsClient ()
235251 service_account_email = service_account .service_account_email
@@ -270,11 +286,11 @@ def _create_signed_delete_url_helper(client, bucket, version="v2", expiration=No
270286 assert not blob .exists ()
271287
272288
273- def test_create_signed_delete_url_v2 (storage_client , signing_bucket ):
289+ def test_create_signed_delete_url_v2 (storage_client , signing_bucket , no_mtls ):
274290 _create_signed_delete_url_helper (storage_client , signing_bucket )
275291
276292
277- def test_create_signed_delete_url_v4 (storage_client , signing_bucket ):
293+ def test_create_signed_delete_url_v4 (storage_client , signing_bucket , no_mtls ):
278294 _create_signed_delete_url_helper (storage_client , signing_bucket , version = "v4" )
279295
280296
@@ -318,20 +334,20 @@ def _create_signed_resumable_upload_url_helper(
318334 assert delete_response .status_code == 204
319335
320336
321- def test_create_signed_resumable_upload_url_v2 (storage_client , signing_bucket ):
337+ def test_create_signed_resumable_upload_url_v2 (storage_client , signing_bucket , no_mtls ):
322338 _create_signed_resumable_upload_url_helper (
323339 storage_client , signing_bucket , version = "v2" ,
324340 )
325341
326342
327- def test_create_signed_resumable_upload_url_v4 (storage_client , signing_bucket ):
343+ def test_create_signed_resumable_upload_url_v4 (storage_client , signing_bucket , no_mtls ):
328344 _create_signed_resumable_upload_url_helper (
329345 storage_client , signing_bucket , version = "v4" ,
330346 )
331347
332348
333349def test_generate_signed_post_policy_v4 (
334- storage_client , buckets_to_delete , blobs_to_delete , service_account ,
350+ storage_client , buckets_to_delete , blobs_to_delete , service_account , no_mtls
335351):
336352 bucket_name = _helpers .unique_name ("post_policy" )
337353 bucket = _helpers .retry_429_503 (storage_client .create_bucket )(bucket_name )
@@ -364,7 +380,7 @@ def test_generate_signed_post_policy_v4(
364380
365381
366382def test_generate_signed_post_policy_v4_invalid_field (
367- storage_client , buckets_to_delete , blobs_to_delete , service_account ,
383+ storage_client , buckets_to_delete , blobs_to_delete , service_account , no_mtls
368384):
369385 bucket_name = _helpers .unique_name ("post_policy-invalid" )
370386 bucket = _helpers .retry_429_503 (storage_client .create_bucket )(bucket_name )
0 commit comments