Merge "Change from unittest to testtools"

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')

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()

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])

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