openstack/aodh
Code Issues Proposed changes

Merge "storage: move nose out of global imports"

Browse Source
This commit is contained in:
Jenkins 2013-04-05 14:56:10 +00:00 committed by Gerrit Code Review
commit f9fda50f0b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/storage/impl_mongodb.py
View File

@ -22,7 +22,6 @@
import copy import copy
import datetime import datetime
import nose
import operator import operator
import os import os
import re import re
@ -234,6 +233,7 @@ class Connection(base.Connection):
try: try:
from ming import mim from ming import mim
except ImportError: except ImportError:
import nose
raise nose.SkipTest("Ming not found") raise nose.SkipTest("Ming not found")
LOG.debug('Creating a new MIM Connection object') LOG.debug('Creating a new MIM Connection object')
Connection._mim_instance = mim.Connection() Connection._mim_instance = mim.Connection()
@ -556,4 +556,5 @@ def require_map_reduce(conn):
import spidermonkey import spidermonkey
except BaseException: except BaseException:
if isinstance(conn.conn, mim.Connection): if isinstance(conn.conn, mim.Connection):
import nose
raise nose.SkipTest('requires spidermonkey') raise nose.SkipTest('requires spidermonkey')