Merge pull request #2356 from coreos-inc/fix-flaky-test

Fix flaky OAuth tests under tor
This commit is contained in:
josephschorr 2017-02-14 14:02:05 -05:00 committed by GitHub
commit 9df8e924a5

View file

@ -1,6 +1,7 @@
import json as py_json import json as py_json
import time import time
import unittest import unittest
import urlparse
import jwt import jwt
@ -59,7 +60,8 @@ class OAuthLoginTestCase(EndpointTestCase):
def test_google_oauth(self): def test_google_oauth(self):
@urlmatch(netloc=r'accounts.google.com', path='/o/oauth2/token') @urlmatch(netloc=r'accounts.google.com', path='/o/oauth2/token')
def account_handler(_, request): def account_handler(_, request):
if request.body.find("code=somecode") > 0: parsed = dict(urlparse.parse_qsl(request.body))
if parsed['code'] == 'somecode':
content = {'access_token': 'someaccesstoken'} content = {'access_token': 'someaccesstoken'}
return py_json.dumps(content) return py_json.dumps(content)
else: else:
@ -81,7 +83,8 @@ class OAuthLoginTestCase(EndpointTestCase):
def test_github_oauth(self): def test_github_oauth(self):
@urlmatch(netloc=r'github.com', path='/login/oauth/access_token') @urlmatch(netloc=r'github.com', path='/login/oauth/access_token')
def account_handler(url, _): def account_handler(url, _):
if url.query.find("code=somecode") > 0: parsed = dict(urlparse.parse_qsl(url.query))
if parsed['code'] == 'somecode':
content = {'access_token': 'someaccesstoken'} content = {'access_token': 'someaccesstoken'}
return py_json.dumps(content) return py_json.dumps(content)
else: else: