@@ -51,10 +51,17 @@ def _create_signed_list_blobs_url_helper(
51
51
)
52
52
53
53
response = requests .get (signed_url )
54
- assert response .status_code == 200
54
+ assert (
55
+ response .status_code == 200
56
+ ), f"Response content start: { response .content } \
57
+ :Response content end. \
58
+ Response headers start: { response .headers } \
59
+ :Response headers end."
55
60
56
61
57
- def test_create_signed_list_blobs_url_v2 (storage_client , signing_bucket , no_mtls ):
62
+ def test_create_signed_list_blobs_url_v2 (
63
+ storage_client , signing_bucket , no_mtls
64
+ ):
58
65
_create_signed_list_blobs_url_helper (
59
66
storage_client ,
60
67
signing_bucket ,
@@ -76,7 +83,9 @@ def test_create_signed_list_blobs_url_v2_w_expiration(
76
83
)
77
84
78
85
79
- def test_create_signed_list_blobs_url_v4 (storage_client , signing_bucket , no_mtls ):
86
+ def test_create_signed_list_blobs_url_v4 (
87
+ storage_client , signing_bucket , no_mtls
88
+ ):
80
89
_create_signed_list_blobs_url_helper (
81
90
storage_client ,
82
91
signing_bucket ,
@@ -137,7 +146,12 @@ def _create_signed_read_url_helper(
137
146
headers ["x-goog-encryption-key-sha256" ] = key_hash
138
147
139
148
response = requests .get (signed_url , headers = headers )
140
- assert response .status_code == 200
149
+ assert (
150
+ response .status_code == 200
151
+ ), f"Response content start: { response .content } \
152
+ :Response content end. \
153
+ Response headers start: { response .headers } \
154
+ :Response headers end."
141
155
142
156
if payload is not None :
143
157
assert response .content == payload
@@ -215,7 +229,9 @@ def test_create_signed_read_url_v4_w_non_ascii_name(
215
229
)
216
230
217
231
218
- def test_create_signed_read_url_v2_w_csek (storage_client , signing_bucket , no_mtls ):
232
+ def test_create_signed_read_url_v2_w_csek (
233
+ storage_client , signing_bucket , no_mtls
234
+ ):
219
235
encryption_key = os .urandom (32 )
220
236
_create_signed_read_url_helper (
221
237
storage_client ,
@@ -226,7 +242,9 @@ def test_create_signed_read_url_v2_w_csek(storage_client, signing_bucket, no_mtl
226
242
)
227
243
228
244
229
- def test_create_signed_read_url_v4_w_csek (storage_client , signing_bucket , no_mtls ):
245
+ def test_create_signed_read_url_v4_w_csek (
246
+ storage_client , signing_bucket , no_mtls
247
+ ):
230
248
encryption_key = os .urandom (32 )
231
249
_create_signed_read_url_helper (
232
250
storage_client ,
@@ -309,7 +327,9 @@ def test_create_signed_read_url_v4_w_access_token_universe_domain(
309
327
"https://www.googleapis.com/auth/devstorage.read_write" ,
310
328
"https://www.googleapis.com/auth/iam" ,
311
329
]
312
- response = universe_domain_iam_client .generate_access_token (name = name , scope = scope )
330
+ response = universe_domain_iam_client .generate_access_token (
331
+ name = name , scope = scope
332
+ )
313
333
314
334
_create_signed_read_url_helper (
315
335
universe_domain_client ,
@@ -320,7 +340,9 @@ def test_create_signed_read_url_v4_w_access_token_universe_domain(
320
340
)
321
341
322
342
323
- def _create_signed_delete_url_helper (client , bucket , version = "v2" , expiration = None ):
343
+ def _create_signed_delete_url_helper (
344
+ client , bucket , version = "v2" , expiration = None
345
+ ):
324
346
expiration = _morph_expiration (version , expiration )
325
347
326
348
blob = bucket .blob ("DELETE_ME.txt" )
@@ -335,7 +357,12 @@ def _create_signed_delete_url_helper(client, bucket, version="v2", expiration=No
335
357
336
358
response = requests .request ("DELETE" , signed_delete_url )
337
359
338
- assert response .status_code == 204
360
+ assert (
361
+ response .status_code == 204
362
+ ), f"Response content start: { response .content } \
363
+ :Response content end. \
364
+ Response headers start: { response .headers } \
365
+ :Response headers end."
339
366
assert response .content == b""
340
367
assert not blob .exists ()
341
368
@@ -345,7 +372,9 @@ def test_create_signed_delete_url_v2(storage_client, signing_bucket, no_mtls):
345
372
346
373
347
374
def test_create_signed_delete_url_v4 (storage_client , signing_bucket , no_mtls ):
348
- _create_signed_delete_url_helper (storage_client , signing_bucket , version = "v4" )
375
+ _create_signed_delete_url_helper (
376
+ storage_client , signing_bucket , version = "v4"
377
+ )
349
378
350
379
351
380
def _create_signed_resumable_upload_url_helper (
@@ -364,22 +393,39 @@ def _create_signed_resumable_upload_url_helper(
364
393
)
365
394
366
395
post_headers = {"x-goog-resumable" : "start" }
367
- post_response = requests .post (signed_resumable_upload_url , headers = post_headers )
368
- assert post_response .status_code == 201
396
+ post_response = requests .post (
397
+ signed_resumable_upload_url , headers = post_headers
398
+ )
399
+ assert (
400
+ post_response .status_code == 201
401
+ ), f"Response content start: { post_response .content } \
402
+ :Response content end. \
403
+ Response headers start: { post_response .headers } \
404
+ :Response headers end."
369
405
370
406
# Finish uploading the body.
371
407
location = post_response .headers ["Location" ]
372
408
put_headers = {"content-length" : str (len (payload ))}
373
409
put_response = requests .put (location , headers = put_headers , data = payload )
374
- assert put_response .status_code == 200
410
+ assert (
411
+ put_response .status_code == 200
412
+ ), f"Response content start: { put_response .content } \
413
+ :Response content end. \
414
+ Response headers start: { put_response .headers } \
415
+ :Response headers end."
375
416
376
417
# Download using a signed URL and verify.
377
418
signed_download_url = blob .generate_signed_url (
378
419
expiration = expiration , method = "GET" , client = client , version = version
379
420
)
380
421
381
422
get_response = requests .get (signed_download_url )
382
- assert get_response .status_code == 200
423
+ assert (
424
+ get_response .status_code == 200
425
+ ), f"Response content start: { get_response .content } \
426
+ :Response content end. \
427
+ Response headers start: { get_response .headers } \
428
+ :Response headers end."
383
429
assert get_response .content == payload
384
430
385
431
# Finally, delete the blob using a signed URL.
@@ -391,18 +437,27 @@ def _create_signed_resumable_upload_url_helper(
391
437
)
392
438
393
439
delete_response = requests .delete (signed_delete_url )
394
- assert delete_response .status_code == 204
440
+ assert (
441
+ delete_response .status_code == 204
442
+ ), f"Response content start: { delete_response .content } \
443
+ :Response content end. \
444
+ Response headers start: { delete_response .headers } \
445
+ :Response headers end."
395
446
396
447
397
- def test_create_signed_resumable_upload_url_v2 (storage_client , signing_bucket , no_mtls ):
448
+ def test_create_signed_resumable_upload_url_v2 (
449
+ storage_client , signing_bucket , no_mtls
450
+ ):
398
451
_create_signed_resumable_upload_url_helper (
399
452
storage_client ,
400
453
signing_bucket ,
401
454
version = "v2" ,
402
455
)
403
456
404
457
405
- def test_create_signed_resumable_upload_url_v4 (storage_client , signing_bucket , no_mtls ):
458
+ def test_create_signed_resumable_upload_url_v4 (
459
+ storage_client , signing_bucket , no_mtls
460
+ ):
406
461
_create_signed_resumable_upload_url_helper (
407
462
storage_client ,
408
463
signing_bucket ,
@@ -439,10 +494,17 @@ def test_generate_signed_post_policy_v4(
439
494
)
440
495
with open (blob_name , "r" ) as f :
441
496
files = {"file" : (blob_name , f )}
442
- response = requests .post (policy ["url" ], data = policy ["fields" ], files = files )
497
+ response = requests .post (
498
+ policy ["url" ], data = policy ["fields" ], files = files
499
+ )
443
500
444
501
os .remove (blob_name )
445
- assert response .status_code == 204
502
+ assert (
503
+ response .status_code == 204
504
+ ), f"Response content start: { response .content } \
505
+ :Response content end. \
506
+ Response headers start: { response .headers } \
507
+ :Response headers end."
446
508
447
509
blob = bucket .get_blob (blob_name )
448
510
assert blob .download_as_bytes () == payload
@@ -487,10 +549,17 @@ def test_generate_signed_post_policy_v4_access_token_sa_email(
487
549
)
488
550
with open (blob_name , "r" ) as f :
489
551
files = {"file" : (blob_name , f )}
490
- response = requests .post (policy ["url" ], data = policy ["fields" ], files = files )
552
+ response = requests .post (
553
+ policy ["url" ], data = policy ["fields" ], files = files
554
+ )
491
555
492
556
os .remove (blob_name )
493
- assert response .status_code == 204
557
+ assert (
558
+ response .status_code == 204
559
+ ), f"Response content start: { response .content } \
560
+ :Response content end. \
561
+ Response headers start: { response .headers } \
562
+ :Response headers end."
494
563
495
564
blob = signing_bucket .get_blob (blob_name )
496
565
blobs_to_delete .append (blob )
@@ -522,9 +591,16 @@ def test_generate_signed_post_policy_v4_invalid_field(
522
591
)
523
592
with open (blob_name , "r" ) as f :
524
593
files = {"file" : (blob_name , f )}
525
- response = requests .post (policy ["url" ], data = policy ["fields" ], files = files )
594
+ response = requests .post (
595
+ policy ["url" ], data = policy ["fields" ], files = files
596
+ )
526
597
527
598
os .remove (blob_name )
528
- assert response .status_code == 400
599
+ assert (
600
+ response .status_code == 400
601
+ ), f"Response content start: { response .content } \
602
+ :Response content end. \
603
+ Response headers start: { response .headers } \
604
+ :Response headers end."
529
605
530
606
assert list (bucket .list_blobs ()) == []
0 commit comments