Skip to content

Fixing b0rken runtimeconfig unit tests. #2612

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.

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
merged 1 commit into from
Oct 25, 2016
Merged
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions runtimeconfig/unit_tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,15 @@ def test_get_variable_w_alternate_client(self):
self.assertEqual(req['path'], '/%s' % (VARIABLE_PATH,))

def test_list_variables_empty(self):
import six

conn = _Connection({})
client = _Client(project=self.PROJECT, connection=conn)
config = self._makeOne(name=self.CONFIG_NAME, client=client)

iterator = config.list_variables()
iterator.update_page()
variables = list(iterator.page)
page = six.next(iterator.pages)
variables = list(page)
token = iterator.next_page_token

self.assertEqual(variables, [])
Expand All @@ -227,6 +229,7 @@ def test_list_variables_empty(self):
self.assertEqual(req['path'], '/%s' % (PATH,))

def test_list_variables_defaults(self):
import six
from google.cloud.runtimeconfig.variable import Variable

VARIABLE_1 = 'variable-one'
Expand All @@ -249,8 +252,8 @@ def test_list_variables_defaults(self):
config = self._makeOne(name=self.CONFIG_NAME, client=client)

iterator = config.list_variables()
iterator.update_page()
variables = list(iterator.page)
page = six.next(iterator.pages)
variables = list(page)
token = iterator.next_page_token

self.assertEqual(len(variables), len(DATA['variables']))
Expand All @@ -269,6 +272,7 @@ def test_list_variables_defaults(self):
self.assertNotIn('filter', req['query_params'])

def test_list_variables_explicit(self):
import six
from google.cloud.runtimeconfig.variable import Variable

VARIABLE_1 = 'variable-one'
Expand All @@ -293,8 +297,8 @@ def test_list_variables_explicit(self):
page_size=3,
page_token=TOKEN,
client=client)
iterator.update_page()
variables = list(iterator.page)
page = six.next(iterator.pages)
variables = list(page)
token = iterator.next_page_token

self.assertEqual(len(variables), len(DATA['variables']))
Expand Down