summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-08-12 10:44:26 -0300
committerBruno Wagner <bwgpro@gmail.com>2015-08-12 17:17:20 -0300
commit9423a3fe4191eb54c5ddf17ceee3cc05b5c074c9 (patch)
treedd7de511e88e36221e346cbe807a09d2ac61f829 /common/src/leap/soledad
parent288aeef8021285ac33f4d805694f86360d4733ca (diff)
[tests] Test encdecpool couldn't resolve inheritance
It was inheriting from twisted testcase in both u1db_tests.TestCase and in BaseSoledadTest, removed u1db testcase and everything is ok now
Diffstat (limited to 'common/src/leap/soledad')
-rw-r--r--common/src/leap/soledad/common/tests/test_encdecpool.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/src/leap/soledad/common/tests/test_encdecpool.py b/common/src/leap/soledad/common/tests/test_encdecpool.py
index a741d993..26eb5175 100644
--- a/common/src/leap/soledad/common/tests/test_encdecpool.py
+++ b/common/src/leap/soledad/common/tests/test_encdecpool.py
@@ -34,7 +34,7 @@ DOC_REV = "rev"
DOC_CONTENT = {'simple': 'document'}
-class TestSyncEncrypterPool(TestCase, BaseSoledadTest):
+class TestSyncEncrypterPool(BaseSoledadTest):
def setUp(self):
BaseSoledadTest.setUp(self)
@@ -76,7 +76,7 @@ class TestSyncEncrypterPool(TestCase, BaseSoledadTest):
self.assertTrue(attempts < 10)
-class TestSyncDecrypterPool(TestCase, BaseSoledadTest):
+class TestSyncDecrypterPool(BaseSoledadTest):
def _insert_doc_cb(self, doc, gen, trans_id):
"""