Merge "Add qpid-python to test-requires"

glance/tests/unit/test_notifier.py

@@ -18,11 +18,8 @@
 import datetime
 import kombu.entity
 import mox
-try:
-    import qpid
-    import qpid.messaging
-except ImportError:
-    qpid = None
+import qpid
+import qpid.messaging
 import stubout
 
 from glance.common import exception
@@ -322,9 +319,6 @@ class TestQpidNotifier(utils.BaseTestCase):
     def setUp(self):
         super(TestQpidNotifier, self).setUp()
 
-        if not qpid:
-            self.skipTest("qpid not installed")
-
         self.mocker = mox.Mox()
 
         self.mock_connection = None

tools/test-requires

@@ -26,4 +26,5 @@ testtools>=0.9.22
 MySQL-python
 psycopg2
 pysendfile==2.0.0
+qpid-python
 xattr>=0.6.0