aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_http_callback.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-08-15 10:34:20 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-08-15 10:34:20 -0500
commit4834ef8ec21e985290f5e0015ae9452070956170 (patch)
tree365b6043f4a18a40a01d5aa13700ab98ee031613 /mediagoblin/tests/test_http_callback.py
parent29cd702e4776811a96c3c088bd9ba8fc6f9176f0 (diff)
parent89909bd6921efb4ec3296c908c5d57eba35ebd21 (diff)
downloadmediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.tar.lz
mediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.tar.xz
mediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.zip
Merge remote-tracking branch 'refs/remotes/tsyesika/master'
New oauth tools! Heck yeah!
Diffstat (limited to 'mediagoblin/tests/test_http_callback.py')
-rw-r--r--mediagoblin/tests/test_http_callback.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_http_callback.py b/mediagoblin/tests/test_http_callback.py
index a0511af7..64b7ee8f 100644
--- a/mediagoblin/tests/test_http_callback.py
+++ b/mediagoblin/tests/test_http_callback.py
@@ -23,7 +23,7 @@ from mediagoblin import mg_globals
from mediagoblin.tools import processing
from mediagoblin.tests.tools import fixture_add_user
from mediagoblin.tests.test_submission import GOOD_PNG
-from mediagoblin.tests import test_oauth as oauth
+from mediagoblin.tests import test_oauth2 as oauth
class TestHTTPCallback(object):
@@ -44,7 +44,7 @@ class TestHTTPCallback(object):
'password': self.user_password})
def get_access_token(self, client_id, client_secret, code):
- response = self.test_app.get('/oauth/access_token', {
+ response = self.test_app.get('/oauth-2/access_token', {
'code': code,
'client_id': client_id,
'client_secret': client_secret})