From e9a30f61fe1f51a8758c4587e8822723fefc3c4e Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Fri, 17 May 2013 09:52:34 +1000 Subject: [PATCH] Change from unittest to testtools part of bug 1177924 Change-Id: I99be2c48dc7143015883b89130083c8ea11abeec Signed-off-by: Doug Hellmann --- ceilometer/storage/impl_mongodb.py | 12 ++++++------ ceilometer/tests/base.py | 6 ++---- tests/test_notifier.py | 2 +- tools/test-requires | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py index 2546cfcb1..319076b55 100644 --- a/ceilometer/storage/impl_mongodb.py +++ b/ceilometer/storage/impl_mongodb.py @@ -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') diff --git a/ceilometer/tests/base.py b/ceilometer/tests/base.py index 8b45b6040..9263c540b 100644 --- a/ceilometer/tests/base.py +++ b/ceilometer/tests/base.py @@ -18,17 +18,15 @@ # under the License. """Test base classes. """ - -import unittest2 - import mox from oslo.config import cfg import stubout +import testtools cfg.CONF.import_opt('pipeline_cfg_file', 'ceilometer.pipeline') -class TestCase(unittest2.TestCase): +class TestCase(testtools.TestCase): def setUp(self): super(TestCase, self).setUp() diff --git a/tests/test_notifier.py b/tests/test_notifier.py index 14ba52ca9..fd883c21b 100644 --- a/tests/test_notifier.py +++ b/tests/test_notifier.py @@ -108,6 +108,6 @@ class TestNotifier(tests_base.TestCase): self.assertEqual(len(pub.counters), 0) notifier.notify(None, MESSAGE) - self.assertGreater(len(pub.counters), 0) + self.assertTrue(len(pub.counters) > 0) self.assertIn('disk.ephemeral.size', [c.name for c in pub.counters]) diff --git a/tools/test-requires b/tools/test-requires index f98df61b9..66a4bb5d4 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -1,5 +1,4 @@ nose -unittest2 coverage mock mox @@ -17,3 +16,4 @@ netifaces sphinx docutils==0.9.1 # for bug 1091333, remove after sphinx >1.1.3 is released. python-spidermonkey +testtools>=0.9.29