From 970f898206d81694dbe1a1db84da923cc78fc915 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 29 Jul 2015 18:16:54 -0300 Subject: [test] Added events enabled flag to False for the tests The soledad tests were breaking after the change to zmq, the event server was trying to create a zmq instance but there are some missing files that prevented the tests from running just fixed those and the tests run again --- common/src/leap/soledad/common/tests/util.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'common/src') diff --git a/common/src/leap/soledad/common/tests/util.py b/common/src/leap/soledad/common/tests/util.py index d8d86850..140d0ea1 100644 --- a/common/src/leap/soledad/common/tests/util.py +++ b/common/src/leap/soledad/common/tests/util.py @@ -43,6 +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.soledad.common import soledad_assert from leap.soledad.common.document import SoledadDocument @@ -194,6 +195,9 @@ class BaseSoledadTest(unittest.TestCase, MockedSharedDBTest): # The following snippet comes from BaseLeapTest.setUpClass, but we # 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-") -- cgit v1.2.3 From 54afb28b372118b0f08d0567b27034dd72fe63e7 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Mon, 3 Aug 2015 14:46:55 -0300 Subject: [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 --- common/src/leap/soledad/common/tests/util.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'common/src') 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-") -- cgit v1.2.3