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/test_couch.py | |
| 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/test_couch.py')
| -rw-r--r-- | tests/test_couch.py | 4 |
1 files changed, 2 insertions, 2 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 # |