summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-28 14:19:59 +0000
committerGerrit Code Review <review@openstack.org>2013-06-28 14:19:59 +0000
commitbc7e5c8996c1c16a90defc65519f8497e345d91d (patch)
tree5b97f5b32d5546e5350ad6cdaf1140f380503aee /tests
parent76bf705b8093f0ed81587226a73688de133af390 (diff)
parent5e85080ffa782b2bc0beac10e64b147f014edd47 (diff)
downloadoslo-bc7e5c8996c1c16a90defc65519f8497e345d91d.tar.gz
oslo-bc7e5c8996c1c16a90defc65519f8497e345d91d.tar.xz
oslo-bc7e5c8996c1c16a90defc65519f8497e345d91d.zip
Merge "Fix tox.ini config"
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/rpc/test_kombu.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py
index 372b925..c8c3f32 100644
--- a/tests/unit/rpc/test_kombu.py
+++ b/tests/unit/rpc/test_kombu.py
@@ -81,6 +81,7 @@ class KombuStubs(fixtures.Fixture):
test = self.test()
if kombu:
+ test.conf = FLAGS
test.config(fake_rabbit=True)
test.config(rpc_response_timeout=5)
test.rpc = impl_kombu