From 42de74116e956ff6922e9093940f97379c8f3aac Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@us.ibm.com>
Date: Tue, 19 Mar 2013 02:04:40 +0000
Subject: [PATCH] Add qpid-python to test-requires

The qpid notification tests are not run if the qpid-python package
is not installed.  This change adds it to the test-requires list
and removes the check for it since it should always be present.

Fixes bug 1173380

Change-Id: I2763e320e6018fde196c903f515920ad33f28aa6
---
 glance/tests/unit/test_notifier.py | 10 ++--------
 tools/test-requires                |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/glance/tests/unit/test_notifier.py b/glance/tests/unit/test_notifier.py
index 675a2e5652..3efcd2813f 100644
--- a/glance/tests/unit/test_notifier.py
+++ b/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
diff --git a/tools/test-requires b/tools/test-requires
index 336f601f3f..7dfef9ad88 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -26,4 +26,5 @@ testtools>=0.9.22
 MySQL-python
 psycopg2
 pysendfile==2.0.0
+qpid-python
 xattr>=0.6.0