Merge "Add qpid-python to test-requires"
This commit is contained in:
commit
1797d833b8
@ -18,11 +18,8 @@
|
|||||||
import datetime
|
import datetime
|
||||||
import kombu.entity
|
import kombu.entity
|
||||||
import mox
|
import mox
|
||||||
try:
|
import qpid
|
||||||
import qpid
|
import qpid.messaging
|
||||||
import qpid.messaging
|
|
||||||
except ImportError:
|
|
||||||
qpid = None
|
|
||||||
import stubout
|
import stubout
|
||||||
|
|
||||||
from glance.common import exception
|
from glance.common import exception
|
||||||
@ -322,9 +319,6 @@ class TestQpidNotifier(utils.BaseTestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestQpidNotifier, self).setUp()
|
super(TestQpidNotifier, self).setUp()
|
||||||
|
|
||||||
if not qpid:
|
|
||||||
self.skipTest("qpid not installed")
|
|
||||||
|
|
||||||
self.mocker = mox.Mox()
|
self.mocker = mox.Mox()
|
||||||
|
|
||||||
self.mock_connection = None
|
self.mock_connection = None
|
||||||
|
@ -26,4 +26,5 @@ testtools>=0.9.22
|
|||||||
MySQL-python
|
MySQL-python
|
||||||
psycopg2
|
psycopg2
|
||||||
pysendfile==2.0.0
|
pysendfile==2.0.0
|
||||||
|
qpid-python
|
||||||
xattr>=0.6.0
|
xattr>=0.6.0
|
||||||
|
Loading…
Reference in New Issue
Block a user