openstack/aodh
Code Issues Proposed changes

Fix tests after nova changes

Browse Source 
Signed-off-by: Julien Danjou <julien@danjou.info>

Change-Id: I8cf023cbc727839075eda7e853694ab16d3f94af
This commit is contained in:
Julien Danjou 2013-04-10 15:21:05 +02:00
parent 8319ab1c82
commit 9eddee1fbe
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova_tests/test_folsom.py
View File

@ -18,13 +18,6 @@
"""Tests for ceilometer.compute.nova_notifier
"""
try:
import nova.conductor
import nose.plugins.skip
raise nose.SkipTest('do not run folsom tests under grizzly')
except ImportError:
pass
# FIXME(dhellmann): Temporarily disable these tests so we can get a
# fix to go through Jenkins.
import nose.plugins.skip
@ -38,13 +31,13 @@ from stevedore import extension
from stevedore.tests import manager as test_manager
from ceilometer.compute import manager
from nova.tests import fake_network
# XXX Folsom compat
from nova import flags
nova_CONF = flags.FLAGS
from nova import db
from nova import context
from nova import service # For nova_CONF.compute_manager
from nova.tests import fake_network
from nova.compute import vm_states
# Needed for flags option, but Essex does not have it
try:

11
nova_tests/test_grizzly.py
View File

@ -19,26 +19,18 @@
"""Tests for ceilometer.compute.nova_notifier
"""
try:
import nova.conductor
except ImportError:
import nose.plugins.skip
raise nose.SkipTest('do not run grizzly tests under folsom')
import contextlib
import datetime
import mock
from oslo.config import cfg
from stevedore import extension
from stevedore.tests import manager as test_manager
## NOTE(dhellmann): These imports are not in the generally approved
## alphabetical order, but they are in the order that actually
## works. Please don't change them.
from nova.tests import fake_network
from nova.compute import vm_states
from nova.compute import instance_types
from nova import config
@ -47,7 +39,6 @@ from nova import db
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
from nova.openstack.common.notifier import api as notifier_api
from nova.tests import fake_network
# For nova_CONF.compute_manager, used in the nova_notifier module.
from nova import service