modernize tests · ideko/google-api-python-client@d898a37 · GitHub
Skip to content

Commit d898a37

Browse files
methanemethane
committed
modernize tests
1 parent 93ff27b commit d898a37

10 files changed

Lines changed: 21 additions & 8 deletions

‎tests/__init__.py‎

Lines changed: 1 addition & 0 deletions

‎tests/test_channel.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Notification channels tests."""
2+
from __future__ import absolute_import
23

34
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
45

‎tests/test_discovery.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
2121
Unit tests for objects created from discovery documents.
2222
"""
23+
from __future__ import absolute_import
24+
import six
2325

2426
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
2527

@@ -89,9 +91,9 @@ def assertUrisEqual(testcase, expected, actual):
8991
testcase.assertEqual(expected.fragment, actual.fragment)
9092
expected_query = parse_qs(expected.query)
9193
actual_query = parse_qs(actual.query)
92-
for name in expected_query.keys():
94+
for name in list(expected_query.keys()):
9395
testcase.assertEqual(expected_query[name], actual_query[name])
94-
for name in actual_query.keys():
96+
for name in list(actual_query.keys()):
9597
testcase.assertEqual(expected_query[name], actual_query[name])
9698

9799

@@ -133,7 +135,7 @@ def _base_fix_up_parameters_test(self, method_desc, http_method, root_desc):
133135
self.assertEqual(STACK_QUERY_PARAMETER_DEFAULT_VALUE,
134136
parameters[param_name])
135137

136-
for param_name, value in root_desc.get('parameters', {}).iteritems():
138+
for param_name, value in six.iteritems(root_desc.get('parameters', {})):
137139
self.assertEqual(value, parameters[param_name])
138140

139141
return parameters
@@ -300,7 +302,7 @@ def test_ResourceMethodParameters_zoo_get(self):
300302
'o': 'object',
301303
'q': 'string',
302304
'rr': 'string'}
303-
keys = param_types.keys()
305+
keys = list(param_types.keys())
304306
self.assertEqual(parameters.argmap, dict((key, key) for key in keys))
305307
self.assertEqual(parameters.required_params, [])
306308
self.assertEqual(sorted(parameters.repeated_params), ['er', 'rr'])
@@ -318,7 +320,7 @@ def test_ResourceMethodParameters_zoo_animals_patch(self):
318320
parameters = ResourceMethodParameters(method_desc)
319321

320322
param_types = {'name': 'string'}
321-
keys = param_types.keys()
323+
keys = list(param_types.keys())
322324
self.assertEqual(parameters.argmap, dict((key, key) for key in keys))
323325
self.assertEqual(parameters.required_params, ['name'])
324326
self.assertEqual(parameters.repeated_params, [])

‎tests/test_errors.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
"""Tests for errors handling
1818
"""
19+
from __future__ import absolute_import
1920

2021
__author__ = 'afshar@google.com (Ali Afshar)'
2122

‎tests/test_http.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
1919
Unit tests for the googleapiclient.http.
2020
"""
21+
from __future__ import absolute_import
22+
from six.moves import range
2123

2224
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
2325

@@ -624,7 +626,7 @@ def test_retry(self):
624626
request.execute(num_retries=num_retries)
625627

626628
self.assertEqual(num_retries, len(sleeptimes))
627-
for retry_num in xrange(num_retries):
629+
for retry_num in range(num_retries):
628630
self.assertEqual(10 * 2**(retry_num + 1), sleeptimes[retry_num])
629631

630632
def test_no_retry_fails_fast(self):

‎tests/test_json_model.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
1919
Unit tests for the JSON model.
2020
"""
21+
from __future__ import absolute_import
22+
import six
2123

2224
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
2325

@@ -214,7 +216,7 @@ class MockResponse(dict):
214216
def __init__(self, items):
215217
super(MockResponse, self).__init__()
216218
self.status = items['status']
217-
for key, value in items.iteritems():
219+
for key, value in six.iteritems(items):
218220
self[key] = value
219221
old_logging = googleapiclient.model.logging
220222
googleapiclient.model.logging = MockLogging()

‎tests/test_mocks.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
1919
Unit tests for the Mocks.
2020
"""
21+
from __future__ import absolute_import
2122

2223
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
2324

‎tests/test_model.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
2020
Unit tests for model utility methods.
2121
"""
22+
from __future__ import absolute_import
2223

2324
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
2425

‎tests/test_protobuf_model.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
1919
Unit tests for the Protocol Buffer model.
2020
"""
21+
from __future__ import absolute_import
2122

2223
__author__ = 'mmcdonald@google.com (Matt McDonald)'
2324

‎tests/test_schema.py‎

Lines changed: 2 additions & 1 deletion

0 commit comments

Comments
 (0)