Skip to content

Fix storage lint #4975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theacodes merged 1 commit into from
Feb 28, 2018
Merged

Fix storage lint #4975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions storage/tests/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,18 +410,18 @@ def test_blob_acl_w_user_project(self):

def test_upload_blob_acl(self):
control = self.bucket.blob('logo')
control_data = self.FILES['logo']
control_data = self.FILES['logo']

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

try:
control.upload_from_filename(control_data['path'])
control.upload_from_filename(control_data['path'])
blob.upload_from_filename(file_data['path'],
predefined_acl='publicRead')
finally:
self.case_blobs_to_delete.append(blob)
self.case_blobs_to_delete.append(control)
self.case_blobs_to_delete.append(control)

control_acl = control.acl
self.assertNotIn('READER', control_acl.all().get_roles())
Expand Down
35 changes: 22 additions & 13 deletions storage/tests/unit/test_blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,8 @@ def _make_resumable_transport(self, headers1, headers2,
return fake_transport, responses

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

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

@staticmethod
def _do_resumable_upload_call2(blob, content_type, data,
resumable_url, total_bytes, predefined_acl=None):
def _do_resumable_upload_call2(
blob, content_type, data, resumable_url, total_bytes,
predefined_acl=None):
# Third mock transport.request() does sends last chunk.
content_range = 'bytes {:d}-{:d}/{:d}'.format(
blob.chunk_size, total_bytes - 1, total_bytes)
Expand All @@ -1193,7 +1196,8 @@ def _do_resumable_upload_call2(blob, content_type, data,
return mock.call(
'PUT', resumable_url, data=payload, headers=expected_headers)

def _do_resumable_helper(self, use_size=False, num_retries=None, predefined_acl=None):
def _do_resumable_helper(
self, use_size=False, num_retries=None, predefined_acl=None):
bucket = _Bucket(name='yesterday')
blob = self._make_one(u'blob-name', bucket=bucket)
blob.chunk_size = blob._CHUNK_SIZE_MULTIPLE
Expand Down Expand Up @@ -1226,11 +1230,14 @@ def _do_resumable_helper(self, use_size=False, num_retries=None, predefined_acl=
self.assertEqual(stream.tell(), total_bytes)

# Check the mocks.
call0 = self._do_resumable_upload_call0(blob, content_type, size=size, predefined_acl=predefined_acl)
call0 = self._do_resumable_upload_call0(
blob, content_type, size=size, predefined_acl=predefined_acl)
call1 = self._do_resumable_upload_call1(
blob, content_type, data, resumable_url, size=size, predefined_acl=predefined_acl)
blob, content_type, data, resumable_url, size=size,
predefined_acl=predefined_acl)
call2 = self._do_resumable_upload_call2(
blob, content_type, data, resumable_url, total_bytes, predefined_acl=predefined_acl)
blob, content_type, data, resumable_url, total_bytes,
predefined_acl=predefined_acl)
self.assertEqual(
transport.request.mock_calls, [call0, call1, call2])

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

def _do_upload_helper(self, chunk_size=None, num_retries=None, predefined_acl=None):
def _do_upload_helper(
self, chunk_size=None, num_retries=None, predefined_acl=None):
blob = self._make_one(u'blob-name', bucket=None)

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

blob._do_multipart_upload.assert_called_once_with(
client, stream, content_type, size, num_retries, predefined_acl)
client, stream, content_type, size, num_retries,
predefined_acl)
blob._do_resumable_upload.assert_not_called()
else:
blob._do_multipart_upload.assert_not_called()
blob._do_resumable_upload.assert_called_once_with(
client, stream, content_type, size, num_retries, predefined_acl)
client, stream, content_type, size, num_retries,
predefined_acl)

def test__do_upload_without_chunk_size(self):
self._do_upload_helper()
Expand All @@ -1293,7 +1303,6 @@ def test__do_upload_with_retry(self):

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

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