From 9eddee1fbeebbe2c5e7f0bc5ddb3aaba9e0013d2 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 10 Apr 2013 15:21:05 +0200
Subject: [PATCH] Fix tests after nova changes

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

Change-Id: I8cf023cbc727839075eda7e853694ab16d3f94af
---
 nova_tests/test_folsom.py  |  9 +--------
 nova_tests/test_grizzly.py | 11 +----------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/nova_tests/test_folsom.py b/nova_tests/test_folsom.py
index 67a840163..d33fafb9e 100644
--- a/nova_tests/test_folsom.py
+++ b/nova_tests/test_folsom.py
@@ -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:
diff --git a/nova_tests/test_grizzly.py b/nova_tests/test_grizzly.py
index b611590bc..118d540db 100644
--- a/nova_tests/test_grizzly.py
+++ b/nova_tests/test_grizzly.py
@@ -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