diff options
Diffstat (limited to 'scripts/run_system_tests.py')
| -rw-r--r-- | scripts/run_system_tests.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/run_system_tests.py b/scripts/run_system_tests.py index 4c9c80c..ce99e7c 100644 --- a/scripts/run_system_tests.py +++ b/scripts/run_system_tests.py @@ -15,12 +15,12 @@ import json import os +import httplib2 from six.moves import http_client import oauth2client from oauth2client import client -from oauth2client import service_account -from oauth2client import transport +from oauth2client.service_account import ServiceAccountCredentials JSON_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_JSON_KEY_PATH') @@ -56,8 +56,8 @@ def _require_environ(): def _check_user_info(credentials, expected_email): - http = credentials.authorize(transport.get_http_object()) - response, content = transport.request(http, USER_INFO) + http = credentials.authorize(httplib2.Http()) + response, content = http.request(USER_INFO) if response.status != http_client.OK: raise ValueError('Expected 200 OK response.') @@ -68,14 +68,14 @@ def _check_user_info(credentials, expected_email): def run_json(): - factory = service_account.ServiceAccountCredentials.from_json_keyfile_name - credentials = factory(JSON_KEY_PATH, scopes=SCOPE) + credentials = ServiceAccountCredentials.from_json_keyfile_name( + JSON_KEY_PATH, scopes=SCOPE) service_account_email = credentials._service_account_email _check_user_info(credentials, service_account_email) def run_p12(): - credentials = service_account.ServiceAccountCredentials.from_p12_keyfile( + credentials = ServiceAccountCredentials.from_p12_keyfile( P12_KEY_EMAIL, P12_KEY_PATH, scopes=SCOPE) _check_user_info(credentials, P12_KEY_EMAIL) |