fix tests when ZMQ is not installed

David Moravek · David Moravek · commit d4bd740a96c8 · 2015-07-15T09:00:34.000+02:00
diff --git a/beaver/tests/test_transport_config.py b/beaver/tests/test_transport_config.py
@@ -10,6 +10,14 @@
 from beaver.transports import create_transport
 from beaver.transports.base_transport import BaseTransport
 
+try:
+    from beaver.transports.zmq_transport import ZmqTransport
+    zmqSkip = False
+except ImportError, e:
+    if e.message == 'No module named zmq':
+        zmqSkip = True
+    else:
+        raise
 
 class DummyTransport(BaseTransport):
     pass
@@ -47,10 +55,11 @@ def test_builtin_udp(self):
             transport = create_transport(beaver_config, logger=self.logger)
             self.assertIsInstance(transport, beaver.transports.udp_transport.UdpTransport)
 
+        @unittest.skipIf(zmqSkip, 'zmq not installed')
         def test_builtin_zmq(self):
             beaver_config = self._get_config(transport='zmq')
             transport = create_transport(beaver_config, logger=self.logger)
-            self.assertIsInstance(transport, beaver.transports.zmq_transport.ZmqTransport)
+            self.assertIsInstance(transport, ZmqTransport)
 
         def test_custom_transport(self):
             beaver_config = self._get_config(transport='beaver.tests.test_transport_config.DummyTransport')
