Skip to content
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

Add InstalledAppFlow #128

Merged
merged 7 commits into from
Mar 22, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix race condition
  • Loading branch information
Jon Wayne Parrott committed Mar 22, 2017
commit 2c2d5af826f83dce977733815ab7e21f1652ec86
8 changes: 7 additions & 1 deletion additional_packages/google_auth_oauthlib/tests/test_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,13 @@ def test_run_local_server(

with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
future = pool.submit(instance.run_local_server)
requests.get(auth_redirect_url)

while not future.done():
try:
requests.get(auth_redirect_url)
except requests.ConnectionError: # pragma: NO COVER
pass

credentials = future.result()

assert credentials.token == mock.sentinel.access_token
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ envlist = lint,py27,py34,py35,py36,pypy,cover

[testenv]
deps =
certifi
flask
futures
mock
oauth2client
pytest
pytest-cov
pytest-localserver
urllib3
certifi
requests
requests-oauthlib
oauth2client
urllib3
grpcio; platform_python_implementation != 'PyPy'
commands =
py.test --cov=google.auth --cov=google.oauth2 --cov=tests {posargs:tests}
Expand Down