Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7bb340f

Browse filesBrowse files
author
Jon Wayne Parrott
authored
Fix storage lint (googleapis#4975)
1 parent ca8a732 commit 7bb340f
Copy full SHA for 7bb340f

2 files changed

+25-16Lines changed: 25 additions & 16 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎storage/tests/system.py‎

Copy file name to clipboardExpand all lines: storage/tests/system.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,18 +410,18 @@ def test_blob_acl_w_user_project(self):
410410

411411
def test_upload_blob_acl(self):
412412
control = self.bucket.blob('logo')
413-
control_data = self.FILES['logo']
413+
control_data = self.FILES['logo']
414414

415415
blob = self.bucket.blob('SmallFile')
416416
file_data = self.FILES['simple']
417417

418418
try:
419-
control.upload_from_filename(control_data['path'])
419+
control.upload_from_filename(control_data['path'])
420420
blob.upload_from_filename(file_data['path'],
421421
predefined_acl='publicRead')
422422
finally:
423423
self.case_blobs_to_delete.append(blob)
424-
self.case_blobs_to_delete.append(control)
424+
self.case_blobs_to_delete.append(control)
425425

426426
control_acl = control.acl
427427
self.assertNotIn('READER', control_acl.all().get_roles())
Collapse file

‎storage/tests/unit/test_blob.py‎

Copy file name to clipboardExpand all lines: storage/tests/unit/test_blob.py
+22-13Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,8 @@ def _make_resumable_transport(self, headers1, headers2,
11431143
return fake_transport, responses
11441144

11451145
@staticmethod
1146-
def _do_resumable_upload_call0(blob, content_type, size=None, predefined_acl=None):
1146+
def _do_resumable_upload_call0(
1147+
blob, content_type, size=None, predefined_acl=None):
11471148
# First mock transport.request() does initiates upload.
11481149
upload_url = (
11491150
'https://www.googleapis.com/upload/storage/v1' +
@@ -1162,8 +1163,9 @@ def _do_resumable_upload_call0(blob, content_type, size=None, predefined_acl=Non
11621163
'POST', upload_url, data=payload, headers=expected_headers)
11631164

11641165
@staticmethod
1165-
def _do_resumable_upload_call1(blob, content_type, data,
1166-
resumable_url, size=None, predefined_acl=None):
1166+
def _do_resumable_upload_call1(
1167+
blob, content_type, data, resumable_url, size=None,
1168+
predefined_acl=None):
11671169
# Second mock transport.request() does sends first chunk.
11681170
if size is None:
11691171
content_range = 'bytes 0-{:d}/*'.format(blob.chunk_size - 1)
@@ -1180,8 +1182,9 @@ def _do_resumable_upload_call1(blob, content_type, data,
11801182
'PUT', resumable_url, data=payload, headers=expected_headers)
11811183

11821184
@staticmethod
1183-
def _do_resumable_upload_call2(blob, content_type, data,
1184-
resumable_url, total_bytes, predefined_acl=None):
1185+
def _do_resumable_upload_call2(
1186+
blob, content_type, data, resumable_url, total_bytes,
1187+
predefined_acl=None):
11851188
# Third mock transport.request() does sends last chunk.
11861189
content_range = 'bytes {:d}-{:d}/{:d}'.format(
11871190
blob.chunk_size, total_bytes - 1, total_bytes)
@@ -1193,7 +1196,8 @@ def _do_resumable_upload_call2(blob, content_type, data,
11931196
return mock.call(
11941197
'PUT', resumable_url, data=payload, headers=expected_headers)
11951198

1196-
def _do_resumable_helper(self, use_size=False, num_retries=None, predefined_acl=None):
1199+
def _do_resumable_helper(
1200+
self, use_size=False, num_retries=None, predefined_acl=None):
11971201
bucket = _Bucket(name='yesterday')
11981202
blob = self._make_one(u'blob-name', bucket=bucket)
11991203
blob.chunk_size = blob._CHUNK_SIZE_MULTIPLE
@@ -1226,11 +1230,14 @@ def _do_resumable_helper(self, use_size=False, num_retries=None, predefined_acl=
12261230
self.assertEqual(stream.tell(), total_bytes)
12271231

12281232
# Check the mocks.
1229-
call0 = self._do_resumable_upload_call0(blob, content_type, size=size, predefined_acl=predefined_acl)
1233+
call0 = self._do_resumable_upload_call0(
1234+
blob, content_type, size=size, predefined_acl=predefined_acl)
12301235
call1 = self._do_resumable_upload_call1(
1231-
blob, content_type, data, resumable_url, size=size, predefined_acl=predefined_acl)
1236+
blob, content_type, data, resumable_url, size=size,
1237+
predefined_acl=predefined_acl)
12321238
call2 = self._do_resumable_upload_call2(
1233-
blob, content_type, data, resumable_url, total_bytes, predefined_acl=predefined_acl)
1239+
blob, content_type, data, resumable_url, total_bytes,
1240+
predefined_acl=predefined_acl)
12341241
self.assertEqual(
12351242
transport.request.mock_calls, [call0, call1, call2])
12361243

@@ -1246,7 +1253,8 @@ def test__do_resumable_upload_with_retry(self):
12461253
def test__do_resumable_upload_with_predefined_acl(self):
12471254
self._do_resumable_helper(predefined_acl='private')
12481255

1249-
def _do_upload_helper(self, chunk_size=None, num_retries=None, predefined_acl=None):
1256+
def _do_upload_helper(
1257+
self, chunk_size=None, num_retries=None, predefined_acl=None):
12501258
blob = self._make_one(u'blob-name', bucket=None)
12511259

12521260
# Create a fake response.
@@ -1274,12 +1282,14 @@ def _do_upload_helper(self, chunk_size=None, num_retries=None, predefined_acl=No
12741282
if chunk_size is None:
12751283

12761284
blob._do_multipart_upload.assert_called_once_with(
1277-
client, stream, content_type, size, num_retries, predefined_acl)
1285+
client, stream, content_type, size, num_retries,
1286+
predefined_acl)
12781287
blob._do_resumable_upload.assert_not_called()
12791288
else:
12801289
blob._do_multipart_upload.assert_not_called()
12811290
blob._do_resumable_upload.assert_called_once_with(
1282-
client, stream, content_type, size, num_retries, predefined_acl)
1291+
client, stream, content_type, size, num_retries,
1292+
predefined_acl)
12831293

12841294
def test__do_upload_without_chunk_size(self):
12851295
self._do_upload_helper()
@@ -1293,7 +1303,6 @@ def test__do_upload_with_retry(self):
12931303

12941304
def _upload_from_file_helper(self, side_effect=None, **kwargs):
12951305
from google.cloud._helpers import UTC
1296-
from google.cloud.storage.acl import ACL
12971306

12981307
blob = self._make_one('blob-name', bucket=None)
12991308
# Mock low-level upload helper on blob (it is tested elsewhere).

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.