summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad/common/tests/test_sqlcipher.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-05-16 15:47:24 -0300
committerTomás Touceda <chiiph@leap.se>2014-05-16 15:47:24 -0300
commit5cb40a959af827e4eadde1c047664c4f4c0ae01d (patch)
treeb11f91ee018a23e0afd7be8c1bc74e0c34a1e64b /common/src/leap/soledad/common/tests/test_sqlcipher.py
parentce22976cc0e203e53799e771aa5e3717d498cc5c (diff)
parent4375c180b3de4eb84603bf15755ae1f7635804fe (diff)
Merge branch 'release-0.5.1'0.5.1
Diffstat (limited to 'common/src/leap/soledad/common/tests/test_sqlcipher.py')
-rw-r--r--common/src/leap/soledad/common/tests/test_sqlcipher.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/common/src/leap/soledad/common/tests/test_sqlcipher.py b/common/src/leap/soledad/common/tests/test_sqlcipher.py
index 66a673b6..c79a6045 100644
--- a/common/src/leap/soledad/common/tests/test_sqlcipher.py
+++ b/common/src/leap/soledad/common/tests/test_sqlcipher.py
@@ -469,11 +469,9 @@ class SQLCipherDatabaseSyncTests(
def setUp(self):
test_sync.DatabaseSyncTests.setUp(self)
- BaseSoledadTest.setUp(self)
def tearDown(self):
test_sync.DatabaseSyncTests.tearDown(self)
- BaseSoledadTest.tearDown(self)
def test_sync_autoresolves(self):
"""
@@ -683,11 +681,9 @@ class SQLCipherSyncTargetTests(
def setUp(self):
test_sync.DatabaseSyncTargetTests.setUp(self)
- #BaseSoledadTest.setUp(self)
def tearDown(self):
test_sync.DatabaseSyncTargetTests.tearDown(self)
- BaseSoledadTest.tearDown(self)
def test_sync_exchange(self):
"""