openstack/aodh
Code Issues Proposed changes

Fix the nova notifier tests after a nova rename

Browse Source 
3222d8bb02

fixes bug 1178055

Change-Id: I49f530a73c70a3efbec000e5de493b0d82ad3435
This commit is contained in:
Angus Salkeld 2013-05-09 12:07:22 +10:00
parent 574fd6962e
commit a60fc5b59a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova_tests/test_notifier.py
View File

@ -32,7 +32,11 @@ from stevedore.tests import manager as test_manager
## works. Please don't change them. ## works. Please don't change them.
from nova.tests import fake_network from nova.tests import fake_network
from nova.compute import vm_states from nova.compute import vm_states
from nova.compute import instance_types try:
from nova.compute import flavors
except ImportError:
from nova.compute import instance_types as flavors
from nova import config from nova import config
from nova import context from nova import context
from nova import db from nova import db
@ -128,7 +132,7 @@ class TestNovaNotifier(base.TestCase):
self.stubs.Set(db, 'instance_update_and_get_original', self.stubs.Set(db, 'instance_update_and_get_original',
lambda context, uuid, kwargs: (self.instance, lambda context, uuid, kwargs: (self.instance,
self.instance)) self.instance))
self.stubs.Set(instance_types, 'extract_instance_type', self.stubs.Set(flavors, 'extract_instance_type',
lambda ref: {}) lambda ref: {})
# Set up to capture the notification messages generated by the # Set up to capture the notification messages generated by the