diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-07-29 17:11:51 -0300 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-08-11 17:00:30 +0200 |
| commit | 5d45904c0d26045bc5174210577527506997b16b (patch) | |
| tree | 0fd9739de5107581359faeafc67fde0267434390 /service/test/support | |
| parent | 8f8c3f3d62293a6fca4abb85d71041531dc74408 (diff) | |
move events diabling to AppTestClient for functional tests
Diffstat (limited to 'service/test/support')
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 3 | ||||
| -rw-r--r-- | service/test/support/integration/soledad_test_base.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index c6cd9936..e4f9e82a 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -42,6 +42,7 @@ from pixelated.resources.root_resource import RootResource from test.support.integration.model import MailBuilder from test.support.test_helper import request_mock from test.support.integration.model import ResponseMail +from leap.common.events.flags import set_events_enabled class AppTestClient(object): @@ -55,6 +56,8 @@ class AppTestClient(object): @defer.inlineCallbacks def start_client(self): + # This class wont work with zmq events for now, check again on future + set_events_enabled(False) soledad_test_folder = self._generate_soledad_test_folder_name() SearchEngine.DEFAULT_INDEX_HOME = soledad_test_folder diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py index 5fed3a12..979b1f96 100644 --- a/service/test/support/integration/soledad_test_base.py +++ b/service/test/support/integration/soledad_test_base.py @@ -15,7 +15,6 @@ # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. from twisted.trial import unittest from test.support.integration.app_test_client import AppTestClient -from leap.common.events.flags import set_events_enabled class SoledadTestBase(unittest.TestCase, AppTestClient): @@ -24,9 +23,7 @@ class SoledadTestBase(unittest.TestCase, AppTestClient): DEFERRED_TIMEOUT_LONG = 300 def setUp(self): - set_events_enabled(False) return self.start_client() def tearDown(self): - set_events_enabled(True) self.cleanup() |