diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-05-28 18:45:33 -0700 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-06-07 11:43:37 -0700 |
| commit | eefc3c1892c523100470414d00a981ea9fbdf3ca (patch) | |
| tree | 59c26e57b40f23e44a5a51bae2a7a50aeccffe48 /nova/test.py | |
| parent | e95807e8cda4463d7c9a2aab918bd2bda3d3cf9e (diff) | |
| download | nova-eefc3c1892c523100470414d00a981ea9fbdf3ca.tar.gz nova-eefc3c1892c523100470414d00a981ea9fbdf3ca.tar.xz nova-eefc3c1892c523100470414d00a981ea9fbdf3ca.zip | |
Use InstanceList object for init_host
Related to blueprint unified-object-model
Change-Id: Idcc4da2a6807a58966e267c62a7f134ce58c890a
Diffstat (limited to 'nova/test.py')
| -rw-r--r-- | nova/test.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/test.py b/nova/test.py index f0dba7c7c..886478362 100644 --- a/nova/test.py +++ b/nova/test.py @@ -41,6 +41,7 @@ from nova import context from nova import db from nova.db import migration from nova.network import manager as network_manager +from nova.objects import base as objects_base from nova.openstack.common.db.sqlalchemy import session from nova.openstack.common import log as logging from nova.openstack.common import timeutils @@ -225,6 +226,10 @@ class TestCase(testtools.TestCase): sqlite_clean_db=CONF.sqlite_clean_db) self.useFixture(_DB_CACHE) + # NOTE(danms): Make sure to reset us back to non-remote objects + # for each test to avoid interactions. + objects_base.NovaObject.indirection_api = None + mox_fixture = self.useFixture(MoxStubout()) self.mox = mox_fixture.mox self.stubs = mox_fixture.stubs |