summaryrefslogtreecommitdiff
path: root/tests/u1db_tests/test_https.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-24 12:03:45 -0200
committerdrebs <drebs@leap.se>2013-01-24 12:03:45 -0200
commit71df5a4431bce607550eec4425f4fdfbdbfa2af7 (patch)
treef71347068d0a9296c857a5027728130e7ed14ca8 /tests/u1db_tests/test_https.py
parent3bf11c9109a457ddbeb47524e34a5c1fd97bd27c (diff)
parent2f761fea9e72554806b012c64d00fcae80e1d254 (diff)
Merge branch 'feature/soledad-api' into develop
Conflicts: src/leap/soledad/util.py
Diffstat (limited to 'tests/u1db_tests/test_https.py')
-rw-r--r--tests/u1db_tests/test_https.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/u1db_tests/test_https.py b/tests/u1db_tests/test_https.py
index 0f4541d4..3f8797d8 100644
--- a/tests/u1db_tests/test_https.py
+++ b/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: