Skip to content

Commit

Permalink
Add qpid-python to test-requires
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Ben Nemec committed May 15, 2013
1 parent 00da175 commit 42de741
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
10 changes: 2 additions & 8 deletions glance/tests/unit/test_notifier.py
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tools/test-requires
Expand Up @@ -26,4 +26,5 @@ testtools>=0.9.22
MySQL-python
psycopg2
pysendfile==2.0.0
qpid-python
xattr>=0.6.0

0 comments on commit 42de741

Please sign in to comment.