From 5e85080ffa782b2bc0beac10e64b147f014edd47 Mon Sep 17 00:00:00 2001 From: Victor Sergeyev Date: Thu, 27 Jun 2013 15:21:20 +0300 Subject: Fix tox.ini config We found that if tests run with testr --subunit option it can cause wrong implementation of tests results. Change-Id: I98c3f3ed90e2291ef984f07a93c89d24da7855d9 --- tests/unit/rpc/test_kombu.py | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit