diff options
| author | kali <kali@leap.se> | 2013-01-30 06:52:59 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-30 06:52:59 +0900 |
| commit | 570f84756b3d1f689a172a3ff0c55abf6a60b9dd (patch) | |
| tree | 0f262acacf35743664c6408edbafe6ba6f119d14 /src/leap/gui/tests/integration | |
| parent | e60abdcb796ad9e2c44e9b37d3a68e7f159c035c (diff) | |
| parent | 10a2303fe2d21999bce56940daecb78576f5b741 (diff) | |
Merge branch 'pre-release-0.2.0' into release-0.2.0
This merge contains today's state of develop branch,
minus soledad and email components.
Diffstat (limited to 'src/leap/gui/tests/integration')
| -rw-r--r-- | src/leap/gui/tests/integration/fake_user_signup.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/leap/gui/tests/integration/fake_user_signup.py b/src/leap/gui/tests/integration/fake_user_signup.py index 12f18966..78873749 100644 --- a/src/leap/gui/tests/integration/fake_user_signup.py +++ b/src/leap/gui/tests/integration/fake_user_signup.py @@ -12,6 +12,7 @@ curl -d login=python_test_user -d password_salt=54321\ from BaseHTTPServer import HTTPServer from BaseHTTPServer import BaseHTTPRequestHandler import cgi +import json import urlparse HOST = "localhost" @@ -19,12 +20,15 @@ PORT = 8000 LOGIN_ERROR = """{"errors":{"login":["has already been taken"]}}""" +from leap.base.tests.test_providers import EXPECTED_DEFAULT_CONFIG + class request_handler(BaseHTTPRequestHandler): responses = { '/': ['ok\n'], '/users.json': ['ok\n'], - '/timeout': ['ok\n'] + '/timeout': ['ok\n'], + '/provider.json': ['%s\n' % json.dumps(EXPECTED_DEFAULT_CONFIG)] } def do_GET(self): |