craigcitro / apitools

83%

master: 89%

LAST BUILD ON BRANCH service

branch: service

CHANGE BRANCH

x

Reset

• service
• adc
• binary_py3
• bounds
• callbacks
• chunked_download
• cleanup
• cleanup_tox
• dedep
• doubled
• encoding
• encoding_bug
• fastlint
• fix
• fix_coverage
• flags
• gce_cleanup
• gen_client_fix
• genpip
• internal_hooks
• lint
• master
• metaclass
• metadata
• mimetype
• more_pip
• morelogging
• oauth2client
• oauth2l
• protorpc_lite
• py35
• register_creds
• release
• scopes_arg
• six_dep
• storage_cleanup
• trav
• urls
• utilfix
• v0.4.1
• v0.4.10
• v0.4.11
• v0.4.2
• v0.4.3
• v0.4.4
• v0.4.8
• v0.4.9
• v0.5.0
• v0.5.1
• v0.5.2
• v0.5.4

Build # 158

Build Type

push

travis-ci

Committed by craigcitro

Commit Message

Update service_account support for oauth2clientv2.

This makes three changes:

* Make the code for loading either .json or .p12 credentials work under either
  oauth2client 2.0.0post1+ or oauth2client < 2.0.0. In particular, this mostly
  amounts to picking up a few renames from the oauth2client changelog.

* Drop `credentials_lib.ServiceAccount()`. From some searching, no one at all
  is using this function, and supporting it makes the case of .p12 keys
  significantly more awkward.

* Change `credentials_lib.ServiceAccountFromFile()` to handle .json keys, not
  .p12 keys. I'm fairly certain that apitools itself was the only caller of
  this code.

Tested by hand (via oauth2l).

Run Details

28 of 28 new or added lines in 2 files covered. (100.0%)

7620 of 9166 relevant lines covered (83.13%)

0.83 hits per line