summaryrefslogtreecommitdiff
path: root/src/leap/soledad/tests/test_couch.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-25 07:44:36 +0900
committerkali <kali@leap.se>2013-01-25 07:44:36 +0900
commit7102309d9636eeb458cc1cdac521a8555172c728 (patch)
tree7c3033c8e30fbfcf0090fee97922bb874e74fd43 /src/leap/soledad/tests/test_couch.py
parentaeabcbd2a771b36ecbd8f4a356e86dd65220ca7b (diff)
parent9efe6ee0fcf0d000d5da60cbf7dddf6479454aa6 (diff)
Merge branch 'develop' of ssh://leap.se/leap_client into develop
Diffstat (limited to 'src/leap/soledad/tests/test_couch.py')
-rw-r--r--src/leap/soledad/tests/test_couch.py39
1 files changed, 11 insertions, 28 deletions
diff --git a/src/leap/soledad/tests/test_couch.py b/src/leap/soledad/tests/test_couch.py
index 5e8d6126..6c3d7daf 100644
--- a/src/leap/soledad/tests/test_couch.py
+++ b/src/leap/soledad/tests/test_couch.py
@@ -46,9 +46,10 @@ def copy_couch_database_for_test(test, db):
gen, docs = db.get_all_docs(include_deleted=True)
for doc in docs:
new_db._put_doc(doc)
- new_db._transaction_log._data = copy.deepcopy(db._transaction_log._data)
- new_db._sync_log._data = copy.deepcopy(db._sync_log._data)
- new_db._conflict_log._data = copy.deepcopy(db._conflict_log._data)
+ new_db._transaction_log = copy.deepcopy(db._transaction_log)
+ new_db._conflicts = copy.deepcopy(db._conflicts)
+ new_db._other_generations = copy.deepcopy(db._other_generations)
+ new_db._indexes = copy.deepcopy(db._indexes)
new_db._set_u1db_data()
return new_db
@@ -112,13 +113,13 @@ class CouchWithConflictsTests(
# the server, so indexing makes no sense. Thus, we ignore index testing for
# now.
-# class CouchIndexTests(DatabaseIndexTests):
-#
-# scenarios = COUCH_SCENARIOS
-#
-# def tearDown(self):
-# self.db.delete_database()
-# super(CouchIndexTests, self).tearDown()
+class CouchIndexTests(test_backends.DatabaseIndexTests):
+
+ scenarios = COUCH_SCENARIOS
+
+ def tearDown(self):
+ self.db.delete_database()
+ super(CouchIndexTests, self).tearDown()
#-----------------------------------------------------------------------------
@@ -196,23 +197,5 @@ class CouchDatabaseSyncTests(test_sync.DatabaseSyncTests):
db.delete_database()
super(CouchDatabaseSyncTests, self).tearDown()
- # The following tests use indexing, so we eliminate them for now because
- # indexing is still not implemented in couch backend.
-
- def test_sync_pulls_changes(self):
- pass
-
- def test_sync_sees_remote_conflicted(self):
- pass
-
- def test_sync_sees_remote_delete_conflicted(self):
- pass
-
- def test_sync_local_race_conflicted(self):
- pass
-
- def test_sync_propagates_deletes(self):
- pass
-
load_tests = tests.load_with_scenarios