diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-28 14:19:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-28 14:19:59 +0000 |
| commit | bc7e5c8996c1c16a90defc65519f8497e345d91d (patch) | |
| tree | 5b97f5b32d5546e5350ad6cdaf1140f380503aee | |
| parent | 76bf705b8093f0ed81587226a73688de133af390 (diff) | |
| parent | 5e85080ffa782b2bc0beac10e64b147f014edd47 (diff) | |
| download | oslo-bc7e5c8996c1c16a90defc65519f8497e345d91d.tar.gz oslo-bc7e5c8996c1c16a90defc65519f8497e345d91d.tar.xz oslo-bc7e5c8996c1c16a90defc65519f8497e345d91d.zip | |
Merge "Fix tox.ini config"
| -rw-r--r-- | tests/unit/rpc/test_kombu.py | 1 | ||||
| -rw-r--r-- | tox.ini | 2 |
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 @@ -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 |