Skip to content

Fix "bad" storage unit tests. #3627

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
dhermes merged 1 commit into from
Jul 18, 2017
Merged

Fix "bad" storage unit tests. #3627

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
20 changes: 11 additions & 9 deletions storage/tests/unit/test_blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,8 @@ def _make_resumable_transport(self, headers1, headers2,
resumable_media.PERMANENT_REDIRECT, headers2)
json_body = '{{"size": "{:d}"}}'.format(total_bytes)
fake_response3 = self._mock_requests_response(
http_client.OK, headers3, content=json_body)
http_client.OK, headers3,
content=json_body.encode('utf-8'))

responses = [fake_response1, fake_response2, fake_response3]
fake_transport.request.side_effect = responses
Expand Down Expand Up @@ -1161,7 +1162,7 @@ def test_upload_from_file_failure(self):
from google.resumable_media import InvalidResponse
from google.cloud import exceptions

message = u'Someone is already in this spot.'
message = b'Someone is already in this spot.'
response = mock.Mock(
content=message, status_code=http_client.CONFLICT,
spec=[u'content', u'status_code'])
Expand All @@ -1170,7 +1171,7 @@ def test_upload_from_file_failure(self):
with self.assertRaises(exceptions.Conflict) as exc_info:
self._upload_from_file_helper(side_effect=side_effect)

self.assertEqual(exc_info.exception.message, message)
self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
self.assertEqual(exc_info.exception.errors, [])

def _do_upload_mock_call_helper(self, blob, client, content_type, size):
Expand Down Expand Up @@ -1307,7 +1308,7 @@ def test_create_resumable_upload_session_with_failure(self):
from google.resumable_media import InvalidResponse
from google.cloud import exceptions

message = u'5-oh-3 woe is me.'
message = b'5-oh-3 woe is me.'
response = mock.Mock(
content=message, status_code=http_client.SERVICE_UNAVAILABLE,
spec=[u'content', u'status_code'])
Expand All @@ -1317,7 +1318,7 @@ def test_create_resumable_upload_session_with_failure(self):
self._create_resumable_upload_session_helper(
side_effect=side_effect)

self.assertEqual(exc_info.exception.message, message)
self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
self.assertEqual(exc_info.exception.errors, [])

def test_get_iam_policy(self):
Expand Down Expand Up @@ -2238,17 +2239,18 @@ def _helper(self, message, **kwargs):
return exc_info

def test_default(self):
message = u'Failure'
message = b'Failure'
exc_info = self._helper(message)
self.assertEqual(exc_info.exception.message, message)
self.assertEqual(exc_info.exception.message, message.decode('utf-8'))
self.assertEqual(exc_info.exception.errors, [])

def test_with_error_info(self):
message = u'Eeek bad.'
message = b'Eeek bad.'
error_info = 'http://test.invalid'
exc_info = self._helper(message, error_info=error_info)

full_message = u'{} ({})'.format(message, error_info)
message_str = message.decode('utf-8')
full_message = u'{} ({})'.format(message_str, error_info)
self.assertEqual(exc_info.exception.message, full_message)
self.assertEqual(exc_info.exception.errors, [])

Expand Down