summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/unit/rpc/test_kombu.py1
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 1 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
diff --git a/tox.ini b/tox.ini
index 9c64629..bd9e5d7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ deps = -r{toxinidir}/requirements.txt
commands =
python tools/patch_tox_venv.py
# due to dependencies between tests (bug 1192207) we use `--concurrency=1` option
- python setup.py testr --slowest --testr-args='--subunit --concurrency=1 {posargs}'
+ python setup.py testr --slowest --testr-args='--concurrency=1 {posargs}'
[flake8]
show-source = True