Skip to content

Move 'bucket.BucketIterator' -> 'connection._BucketIterator'. #358

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
tseaver merged 3 commits into from
Nov 11, 2014
Merged

Move 'bucket.BucketIterator' -> 'connection._BucketIterator'. #358

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1903ae
Move 'bucket.BucketIterator' -> 'connection._BucketIterator'.
tseaver Nov 8, 2014
47b23fb
Unneeded shim.
tseaver Nov 8, 2014
d0cff2c
Move 'key._KeyIterator' -> 'bucket._KeyIterator'.
tseaver Nov 8, 2014
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
Prev Previous commit
Next Next commit
Unneeded shim.
  • Loading branch information
@tseaver
tseaver committed Nov 11, 2014
commit 47b23fbe49ebdbb6b710c62d5b7322f8665a7d0f
24 changes: 3 additions & 21 deletions gcloud/storage/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,23 +620,23 @@ def _makeOne(self, *args, **kw):
return self._getTargetClass()(*args, **kw)

def test_ctor(self):
connection = _Connection()
connection = object()
iterator = self._makeOne(connection)
self.assertTrue(iterator.connection is connection)
self.assertEqual(iterator.path, '/b')
self.assertEqual(iterator.page_number, 0)
self.assertEqual(iterator.next_page_token, None)

def test_get_items_from_response_empty(self):
connection = _Connection()
connection = object()
iterator = self._makeOne(connection)
self.assertEqual(list(iterator.get_items_from_response({})), [])

def test_get_items_from_response_non_empty(self):
from gcloud.storage.bucket import Bucket
KEY = 'key'
response = {'items': [{'name': KEY}]}
connection = _Connection()
connection = object()
iterator = self._makeOne(connection)
buckets = list(iterator.get_items_from_response(response))
self.assertEqual(len(buckets), 1)
Expand Down Expand Up @@ -741,24 +741,6 @@ def request(self, **kw):
return self._response, self._content


class _Connection(object):

def __init__(self, *responses):
self._responses = responses
self._requested = []

def api_request(self, **kw):
from gcloud.storage.exceptions import NotFound
self._requested.append(kw)

try:
response, self._responses = self._responses[0], self._responses[1:]
except:
raise NotFound('miss')
else:
return response


class _Credentials(object):

service_account_name = 'testing@example.com'
Expand Down