diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-08-22 22:34:06 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-08-22 22:34:06 +0530 |
| commit | 70cc6eb8f383dcc97aeac22216a9da0d65a09085 (patch) | |
| tree | 7f9d646002f2e6db763b1b3e89d9762efb12a544 /mediagoblin/tests/test_http_callback.py | |
| parent | e018b2120ac4131afab6611c84f8cfbe0926e640 (diff) | |
| parent | e7b8059f17c98ee88d933af52b0c4d858e882e8e (diff) | |
| download | mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.lz mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.xz mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.zip | |
Resolve merge conflict and merge.
Diffstat (limited to 'mediagoblin/tests/test_http_callback.py')
| -rw-r--r-- | mediagoblin/tests/test_http_callback.py | 4 |
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}) |