diff options
| author | Matt Riedemann <mriedem@us.ibm.com> | 2016-08-29 11:52:10 -0400 |
|---|---|---|
| committer | Matt Riedemann <mriedem@us.ibm.com> | 2016-08-29 11:52:10 -0400 |
| commit | aeb15371ea4fc03310d5a7667e6f95157e0132e7 (patch) | |
| tree | 00e1c79435665c6ef4b5e4f75eac07ba603ae521 /nova/test.py | |
| parent | bc344458e7603886509a5a80ca7dca628b203c93 (diff) | |
| download | nova-aeb15371ea4fc03310d5a7667e6f95157e0132e7.tar.gz | |
Use StableObjectJsonFixture from o.vo
StableObjectJsonFixture has been in o.vo since the 1.9.0
release and we require >=1.13.0 in g-r now, so we should
use the fixture from the library rather than keep a
duplicate in nova.
This is also needed to use o.vo 1.17.0 which has change
39a057becc10d1cfb5a5d5024bfcbbe6db1b56be that breaks the
fixture's erroneous unit test.
Change-Id: Idd0e02a1c19300c3ab7a57cbacb78d1f07037843
Closes-Bug: #1618115
Diffstat (limited to 'nova/test.py')
| -rw-r--r-- | nova/test.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/test.py b/nova/test.py index 047e074185..caf1f89b8f 100644 --- a/nova/test.py +++ b/nova/test.py @@ -40,6 +40,7 @@ from oslo_log.fixture import logging_error as log_fixture from oslo_log import log as logging from oslo_serialization import jsonutils from oslo_utils import timeutils +from oslo_versionedobjects import fixture as ovo_fixture from oslotest import moxstubout import six import testtools @@ -229,7 +230,7 @@ class TestCase(testtools.TestCase): objects_base.NovaObjectRegistry._registry._obj_classes) self.addCleanup(self._restore_obj_registry) - self.useFixture(nova_fixtures.StableObjectJsonFixture()) + self.useFixture(ovo_fixture.StableObjectJsonFixture()) # NOTE(mnaser): All calls to utils.is_neutron() are cached in # nova.utils._IS_NEUTRON. We set it to None to avoid any |