summaryrefslogtreecommitdiff
path: root/nova/tests/conf_fixture.py
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2012-12-18 16:14:25 +1300
committerRobert Collins <robertc@robertcollins.net>2012-12-18 16:21:36 +1300
commita4b5aad7db369e5bfedacd5ffd3188ff22945141 (patch)
tree5282f0e5dfd74dfa77e6665925d1548be43fa994 /nova/tests/conf_fixture.py
parent8749df777583f3c07e94ef277c7c93101e8bd541 (diff)
downloadnova-a4b5aad7db369e5bfedacd5ffd3188ff22945141.tar.gz
Reset the IPv6 API backend when resetting the conf stack.
This fixes test isolation errors where tests were running with the wrong ipv6 backend and failing. The failures occured because Python discovers tests in filesystem order rather than a sorted order, and the test that was changing the backend had previously always run later under nose, which does not use filesystem order. Change-Id: Ife4370d0747b269c9bc9aabb50c531cb6c9fec13
Diffstat (limited to 'nova/tests/conf_fixture.py')
-rw-r--r--nova/tests/conf_fixture.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py
index fa7ecebf42..0ff333dd18 100644
--- a/nova/tests/conf_fixture.py
+++ b/nova/tests/conf_fixture.py
@@ -19,6 +19,7 @@
import fixtures
from nova import config
+from nova import ipv6
from nova.openstack.common import cfg
from nova.tests.utils import cleanup_dns_managers
@@ -67,3 +68,4 @@ class ConfFixture(fixtures.Fixture):
config.parse_args([], default_config_files=[])
self.addCleanup(self.conf.reset)
self.addCleanup(cleanup_dns_managers)
+ self.addCleanup(ipv6.api.reset_backend)