summaryrefslogtreecommitdiff
path: root/tests/u1db_tests
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-24 14:29:31 -0200
committerdrebs <drebs@leap.se>2013-01-24 14:29:31 -0200
commit12bee096d1318511feb19f5256e1cb3d4823c5f5 (patch)
tree3b6d5005a46f8767f873809d3e450fb0025dc899 /tests/u1db_tests
parent517ec48dee4e743a9f68622e14a7b56be6685881 (diff)
parentc206b64294f1fade1001880f8a6965d39e107088 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_client into develop
Conflicts: src/leap/soledad/__init__.py
Diffstat (limited to 'tests/u1db_tests')
-rw-r--r--tests/u1db_tests/test_backends.py4
-rw-r--r--tests/u1db_tests/test_http_database.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/u1db_tests/test_backends.py b/tests/u1db_tests/test_backends.py
index 81150994..a53b01ba 100644
--- a/tests/u1db_tests/test_backends.py
+++ b/tests/u1db_tests/test_backends.py
@@ -953,7 +953,7 @@ class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests):
def test_put_doc_if_newer_autoresolve_3(self):
doc_a1 = self.db.create_doc_from_json(simple_doc)
doc_a1b1 = self.make_document(doc_a1.doc_id, 'test:1|other:1', "{}")
- doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}')
+ doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}')
doc_a3 = self.make_document(doc_a1.doc_id, 'test:3', "{}")
state, _ = self.db._put_doc_if_newer(
doc_a1b1, save_conflict=True, replica_uid='r', replica_gen=1,
@@ -979,7 +979,7 @@ class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests):
def test_put_doc_if_newer_autoresolve_4(self):
doc_a1 = self.db.create_doc_from_json(simple_doc)
doc_a1b1 = self.make_document(doc_a1.doc_id, 'test:1|other:1', None)
- doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}')
+ doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}')
doc_a3 = self.make_document(doc_a1.doc_id, 'test:3', None)
state, _ = self.db._put_doc_if_newer(
doc_a1b1, save_conflict=True, replica_uid='r', replica_gen=1,
diff --git a/tests/u1db_tests/test_http_database.py b/tests/u1db_tests/test_http_database.py
index 40a839a5..f21e6da1 100644
--- a/tests/u1db_tests/test_http_database.py
+++ b/tests/u1db_tests/test_http_database.py
@@ -200,7 +200,7 @@ class TestHTTPDatabaseCtrWithCreds(tests.TestCase):
'token_key': tests.token1.key,
'token_secret': tests.token1.secret
}})
- self.assertIn('oauth', db1._creds)
+ self.assertIn('oauth', db1._creds)
class TestHTTPDatabaseIntegration(tests.TestCaseWithServer):