summaryrefslogtreecommitdiff
path: root/common/src
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-08-03 14:46:55 -0300
committerBruno Wagner <bwgpro@gmail.com>2015-08-03 14:48:38 -0300
commit54afb28b372118b0f08d0567b27034dd72fe63e7 (patch)
treec70794389e859c8ab831f0e3964633f60767649c /common/src
parent970f898206d81694dbe1a1db84da923cc78fc915 (diff)
[bug] BaseSoledadTest now inherit from BaseLeapTest
That is the right way TM to fix the events issue without explicitly setting the flag, as kaliy suggested
Diffstat (limited to 'common/src')
-rw-r--r--common/src/leap/soledad/common/tests/util.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/common/src/leap/soledad/common/tests/util.py b/common/src/leap/soledad/common/tests/util.py
index 140d0ea1..cbd92b94 100644
--- a/common/src/leap/soledad/common/tests/util.py
+++ b/common/src/leap/soledad/common/tests/util.py
@@ -43,7 +43,7 @@ from u1db.remote import http_database
from twisted.trial import unittest
from leap.common.files import mkdir_p
-from leap.common.events.flags import set_events_enabled
+from leap.common.testing.basetest import BaseLeapTest
from leap.soledad.common import soledad_assert
from leap.soledad.common.document import SoledadDocument
@@ -185,7 +185,7 @@ def token_soledad_sync_target(test, path):
return st
-class BaseSoledadTest(unittest.TestCase, MockedSharedDBTest):
+class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest):
"""
Instantiates Soledad for usage in tests.
"""
@@ -196,8 +196,6 @@ class BaseSoledadTest(unittest.TestCase, MockedSharedDBTest):
# repeat it here because twisted.trial does not work with
# setUpClass/tearDownClass.
- set_events_enabled(False)
-
self.old_path = os.environ['PATH']
self.old_home = os.environ['HOME']
self.tempdir = tempfile.mkdtemp(prefix="leap_tests-")