summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-15 21:10:25 +0000
committerGerrit Code Review <review@openstack.org>2013-01-15 21:10:25 +0000
commitf578fc4e220f4d57aebd6289bbf8b0181c26a066 (patch)
tree63365805110d08e53a78bd03d908260655833f4d /nova
parente98ec572f0989491ddfcb6de68a3e5bc7d4e0d73 (diff)
parent13298999a81164c7538d0eecd8e19f15b95458ce (diff)
Merge "Remove unused import."
Diffstat (limited to 'nova')
-rw-r--r--nova/service.py1
-rw-r--r--nova/tests/test_service.py1
2 files changed, 0 insertions, 2 deletions
diff --git a/nova/service.py b/nova/service.py
index 39e414eb6..0fde14baa 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -32,7 +32,6 @@ import greenlet
from nova import conductor
from nova import context
-from nova import db
from nova import exception
from nova.openstack.common import cfg
from nova.openstack.common import eventlet_backdoor
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index 4873714f3..71beed51e 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -112,7 +112,6 @@ class ServiceTestCase(test.TestCase):
self.host = 'foo'
self.binary = 'nova-fake'
self.topic = 'fake'
- self.mox.StubOutWithMock(service, 'db')
self.mox.StubOutWithMock(db, 'service_create')
self.mox.StubOutWithMock(db, 'service_get_by_args')
self.flags(use_local=True, group='conductor')