diff options
| author | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
| commit | 12bee096d1318511feb19f5256e1cb3d4823c5f5 (patch) | |
| tree | 3b6d5005a46f8767f873809d3e450fb0025dc899 /tests | |
| parent | 517ec48dee4e743a9f68622e14a7b56be6685881 (diff) | |
| parent | c206b64294f1fade1001880f8a6965d39e107088 (diff) | |
Merge branch 'develop' of ssh://code.leap.se/leap_client into develop
Conflicts:
src/leap/soledad/__init__.py
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_couch.py | 4 | ||||
| -rw-r--r-- | tests/u1db_tests/test_backends.py | 4 | ||||
| -rw-r--r-- | tests/u1db_tests/test_http_database.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_couch.py b/tests/test_couch.py index b7fab193..5e8d6126 100644 --- a/tests/test_couch.py +++ b/tests/test_couch.py @@ -41,7 +41,7 @@ def make_couch_database_for_test(test, replica_uid): def copy_couch_database_for_test(test, db): new_db = couch.CouchDatabase('http://localhost:5984', - db._replica_uid+'_copy', + db._replica_uid + '_copy', replica_uid=db._replica_uid or 'test') gen, docs = db.get_all_docs(include_deleted=True) for doc in docs: @@ -112,7 +112,7 @@ class CouchWithConflictsTests( # the server, so indexing makes no sense. Thus, we ignore index testing for # now. -#class CouchIndexTests(DatabaseIndexTests): +# class CouchIndexTests(DatabaseIndexTests): # # scenarios = COUCH_SCENARIOS # 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): |