diff options
author | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
---|---|---|
committer | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
commit | e1494639f57cafddfd433c62adaa52a21f104e10 (patch) | |
tree | b9e6b700db7ab9d9b3f927222eb0f780e7c851d8 /src/leap/soledad/tests/u1db_tests/test_https.py | |
parent | 19da34c598ce6db172c1e1a8978bf031fc6db89b (diff) | |
parent | 1dec55b5c5054a4c42534c0f7e9b8bad5b82c27c (diff) |
Merge branch 'feature/soledad-api' into develop
Conflicts:
src/leap/soledad/util.py
Diffstat (limited to 'src/leap/soledad/tests/u1db_tests/test_https.py')
-rw-r--r-- | src/leap/soledad/tests/u1db_tests/test_https.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/leap/soledad/tests/u1db_tests/test_https.py b/src/leap/soledad/tests/u1db_tests/test_https.py index 0f4541d4..3f8797d8 100644 --- a/src/leap/soledad/tests/u1db_tests/test_https.py +++ b/src/leap/soledad/tests/u1db_tests/test_https.py @@ -11,11 +11,11 @@ from leap.soledad.tests import u1db_tests as tests from u1db.remote import ( http_client, http_target, - ) +) from leap.soledad.tests.u1db_tests.test_remote_sync_target import ( make_oauth_http_app, - ) +) def https_server_def(): @@ -56,10 +56,11 @@ class TestHttpSyncTargetHttpsSupport(tests.TestCaseWithServer): scenarios = [ ('oauth_https', {'server_def': https_server_def, 'make_app_with_state': make_oauth_http_app, - 'make_document_for_test': tests.make_document_for_test, + 'make_document_for_test': + tests.make_document_for_test, 'sync_target': oauth_https_sync_target }), - ] + ] def setUp(self): try: |