diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/rpc/test_zmq.py | 33 | ||||
| -rw-r--r-- | tests/unit/test_version.py | 7 |
2 files changed, 21 insertions, 19 deletions
diff --git a/tests/unit/rpc/test_zmq.py b/tests/unit/rpc/test_zmq.py index 2dbacb0..d43c384 100644 --- a/tests/unit/rpc/test_zmq.py +++ b/tests/unit/rpc/test_zmq.py @@ -44,10 +44,14 @@ FLAGS = cfg.CONF class _RpcZmqBaseTestCase(common.BaseRpcTestCase): - @testutils.skip_if(True, "Zmq tests broken on jenkins") + # TESTCNT needs to be a class var as each run + # by subclasses must have a unique identifier + TESTCNT = 0 + + @testutils.skip_if(not impl_zmq, "ZeroMQ library required") def setUp(self, topic='test', topic_nested='nested'): - if not impl_zmq: - return None + _RpcZmqBaseTestCase.TESTCNT += 1 + testcnt = _RpcZmqBaseTestCase.TESTCNT self.reactor = None self.rpc = impl_zmq @@ -60,21 +64,19 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase): # We'll change this if we detect no daemon running. ipc_dir = FLAGS.rpc_zmq_ipc_dir - # Our IPC dir, if no nova-rpc-zmq_receiver is running system-wide. - internal_ipc_dir = '/tmp/openstack-zmq.ipc.test' - # Only launch the router if it isn't running. if not os.path.exists(os.path.join(ipc_dir, "zmq_topic_zmq_replies")): - LOG.info(_("Running internal zmq receiver.")) - # The normal ipc_dir default needs to run as root, - # /tmp is easier within a testing environment. + # NOTE(ewindisch): rpc_zmq_port and internal_ipc_dir must + # increment to avoid async socket + # closing/wait delays causing races + # between tearDown() and setUp() + self.config(rpc_zmq_port=9500 + testcnt) + internal_ipc_dir = "/tmp/openstack-zmq.ipc.test.%s" % testcnt self.config(rpc_zmq_ipc_dir=internal_ipc_dir) - # Value has changed. - ipc_dir = FLAGS.rpc_zmq_ipc_dir - - self.setup_receiver(ipc_dir) - elif ipc_dir != internal_ipc_dir: + LOG.info(_("Running internal zmq receiver.")) + self.setup_receiver(internal_ipc_dir) + else: LOG.warning(_("Detected zmq-receiver socket.")) LOG.warning(_("Assuming nova-rpc-zmq-receiver is running.")) LOG.warning(_("Using system zmq receiver deamon.")) @@ -108,9 +110,8 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase): "Socket may already be in use.")) raise + @testutils.skip_if(not impl_zmq, "ZeroMQ library required") def tearDown(self): - if not impl_zmq: - return None if self.reactor: self.reactor.close() diff --git a/tests/unit/test_version.py b/tests/unit/test_version.py index c67ccde..99c11f5 100644 --- a/tests/unit/test_version.py +++ b/tests/unit/test_version.py @@ -1,6 +1,7 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 Red Hat, Inc. +# Copyright 2012-2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain @@ -44,7 +45,7 @@ class DeferredVersionTestCase(BaseTestCase): def test_cached_version(self): class MyVersionInfo(version.VersionInfo): - def _generate_version(self): + def _get_version_from_pkg_resources(self): return "5.5.5.5" deferred_string = MyVersionInfo("openstack").\ @@ -54,7 +55,7 @@ class DeferredVersionTestCase(BaseTestCase): def test_print_cached_version(self): class MyVersionInfo(version.VersionInfo): - def _generate_version(self): + def _get_version_from_pkg_resources(self): return "5.5.5.5" deferred_string = MyVersionInfo("openstack")\ @@ -71,7 +72,7 @@ class DeferredVersionTestCase(BaseTestCase): my_version = "11111222223333344444555556666677777888889999900000" class MyVersionInfo(version.VersionInfo): - def _generate_version(self): + def _get_version_from_pkg_resources(self): return my_version deferred_string = MyVersionInfo("openstack")\ |