diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-18 18:20:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-18 18:20:56 +0000 |
| commit | e131d6e3dbafe84c8ff4dfe9caa5a46de938cfaa (patch) | |
| tree | 9eb71c8efee8aa55bd08861bd9b7c4ee55d6c121 /nova | |
| parent | 7e80ff383bbfe16bcb081f1934234f6fda665c2a (diff) | |
| parent | a4b5aad7db369e5bfedacd5ffd3188ff22945141 (diff) | |
| download | nova-e131d6e3dbafe84c8ff4dfe9caa5a46de938cfaa.tar.gz nova-e131d6e3dbafe84c8ff4dfe9caa5a46de938cfaa.tar.xz nova-e131d6e3dbafe84c8ff4dfe9caa5a46de938cfaa.zip | |
Merge "Reset the IPv6 API backend when resetting the conf stack."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/conf_fixture.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py index fa7ecebf4..0ff333dd1 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) |