Merge pull request googleapis#2612 from dhermes/fix-runtimeconfig-after-2594

Fixing b0rken runtimeconfig unit tests.

Author: dhermes

runtimeconfig/unit_tests/test_config.py

@@ -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, [])
@@ -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'
@@ -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']))
@@ -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'
@@ -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']))