openstack/ceilometer
Code Issues Proposed changes

Change from unittest to testtools

Browse Source 
part of bug 1177924

Change-Id: I99be2c48dc7143015883b89130083c8ea11abeec
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Angus Salkeld
2013-05-17 09:52:34 +10:00
parent 8da9ac25fe
commit e9a30f61fe
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ceilometer/storage/impl_mongodb.py
View File

@@ -213,8 +213,8 @@ class Connection(base.Connection):
try:
from ming import mim
except ImportError:
import nose
raise nose.SkipTest("Ming not found")
import testtools
raise testtools.testcase.TestSkipped('requires mim')
LOG.debug('Creating a new MIM Connection object')
Connection._mim_instance = mim.Connection()
self.conn = Connection._mim_instance
@@ -564,8 +564,8 @@ def require_map_reduce(conn):
try:
from ming import mim
if hasattr(conn, "conn") and isinstance(conn.conn, mim.Connection):
import nose
raise nose.SkipTest('requires spidermonkey')
import testtools
raise testtools.testcase.TestSkipped('requires spidermonkey')
except ImportError:
import nose
raise nose.SkipTest('requires mim')
import testtools
raise testtools.testcase.TestSkipped('requires mim')