diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-25 19:15:25 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-25 19:15:25 -0400 |
| commit | 3b413203993a0490f3adf9c0737c207be263eb07 (patch) | |
| tree | ee01d71115b1163435ecac39f4769a39165b1eae /src/leap/common/testing/basetest.py | |
| parent | ba868e93c967cc8e9521471163f9127b63da1949 (diff) | |
| parent | cef15c04610ee188052af78ead8cfe7ea29d81c6 (diff) | |
Merge tag '0.5.1' into debian/experimental
Tag leap.bitmask version 0.5.1
Diffstat (limited to 'src/leap/common/testing/basetest.py')
| -rw-r--r-- | src/leap/common/testing/basetest.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/leap/common/testing/basetest.py b/src/leap/common/testing/basetest.py index 3d3cee0..2e84a25 100644 --- a/src/leap/common/testing/basetest.py +++ b/src/leap/common/testing/basetest.py @@ -52,7 +52,7 @@ class BaseLeapTest(unittest.TestCase): cls.tearDownEnv() @classmethod - def setUpEnv(cls): + def setUpEnv(cls, launch_events_server=True): """ Sets up common facilities for testing this TestCase: - custom PATH and HOME environmental variables @@ -72,14 +72,15 @@ class BaseLeapTest(unittest.TestCase): os.environ["PATH"] = bin_tdir os.environ["HOME"] = cls.tempdir os.environ["XDG_CONFIG_HOME"] = os.path.join(cls.tempdir, ".config") - cls._init_events() + if launch_events_server: + cls._init_events() @classmethod def _init_events(cls): if flags.EVENTS_ENABLED: cls._server = events_server.ensure_server( - emit_addr="tcp://127.0.0.1:0", - reg_addr="tcp://127.0.0.1:0") + emit_addr="tcp://127.0.0.1", + reg_addr="tcp://127.0.0.1") events_client.configure_client( emit_addr="tcp://127.0.0.1:%d" % cls._server.pull_port, reg_addr="tcp://127.0.0.1:%d" % cls._server.pub_port) |