summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-10 15:55:21 -0200
committerdrebs <drebs@leap.se>2013-01-10 15:55:21 -0200
commitc317af1da8060f66576c817ea7073e9c73f43916 (patch)
tree51159d599819bfed804329d85bc69e9b35062248
parente819be96ad829875c1ec533d9ab415e576e63587 (diff)
LeapDatabase passes u1db TestHTTPClientBase.
-rw-r--r--src/leap/soledad/tests/test_leap_backend.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/leap/soledad/tests/test_leap_backend.py b/src/leap/soledad/tests/test_leap_backend.py
index 5a992e76..5f58c832 100644
--- a/src/leap/soledad/tests/test_leap_backend.py
+++ b/src/leap/soledad/tests/test_leap_backend.py
@@ -16,7 +16,10 @@ from leap.soledad.tests.u1db_tests.test_backends import AllDatabaseTests
from leap.soledad.tests.u1db_tests.test_http_database import (
TestHTTPDatabaseSimpleOperations,
TestHTTPDatabaseCtrWithCreds,
- TestHTTPDatabaseIntegration
+ TestHTTPDatabaseIntegration,
+)
+from leap.soledad.tests.u1db_tests.test_http_client import (
+ TestHTTPClientBase,
)
@@ -75,7 +78,7 @@ class LeapTests(AllDatabaseTests):
#-----------------------------------------------------------------------------
-# The following tests come from `u1db.tests.test_http_client`.
+# The following tests come from `u1db.tests.test_http_database`.
#-----------------------------------------------------------------------------
class TestLeapDatabaseSimpleOperations(TestHTTPDatabaseSimpleOperations):
@@ -159,4 +162,13 @@ class TestLeapDatabaseIntegration(TestHTTPDatabaseIntegration):
self.assertGetDoc(db0, '%fff', doc.rev, '{}', False)
self.assertGetDoc(db, '%fff', doc.rev, '{}', False)
+
+#-----------------------------------------------------------------------------
+# The following tests come from `u1db.tests.test_http_client`.
+#-----------------------------------------------------------------------------
+
+class TestLeapClientBase(TestHTTPClientBase):
+ pass
+
+
load_tests = tests.load_with_scenarios