Merge "Use testtools as test base class."

1 files changed, 5 insertions, 6 deletions

diff --git a/tests/unit/test_timeutils.py b/tests/unit/test_timeutils.py
index 9c3469e..894b843 100644
--- a/tests/unit/test_timeutils.py
+++ b/tests/unit/test_timeutils.py
@@ -17,17 +17,18 @@
 
 import calendar
 import datetime
-import unittest
 
 import iso8601
 import mock
+import testtools
 
 from openstack.common import timeutils
 
 
-class TimeUtilsTest(unittest.TestCase):
+class TimeUtilsTest(testtools.TestCase):
 
     def setUp(self):
+        super(TimeUtilsTest, self).setUp()
         self.skynet_self_aware_time_str = '1997-08-29T06:14:00Z'
         self.skynet_self_aware_time = datetime.datetime(1997, 8, 29, 6, 14, 0)
         self.one_minute_before = datetime.datetime(1997, 8, 29, 6, 13, 0)
@@ -35,9 +36,7 @@ class TimeUtilsTest(unittest.TestCase):
         self.skynet_self_aware_time_perfect_str = '1997-08-29T06:14:00.000000'
         self.skynet_self_aware_time_perfect = datetime.datetime(1997, 8, 29,
                                                                 6, 14, 0)
-
-    def tearDown(self):
-        timeutils.clear_time_override()
+        self.addCleanup(timeutils.clear_time_override)
 
     def test_isotime(self):
         with mock.patch('datetime.datetime') as datetime_mock:
@@ -156,7 +155,7 @@ class TimeUtilsTest(unittest.TestCase):
         self.assertEqual(iso, timeutils.iso8601_from_timestamp(ts))
 
 
-class TestIso8601Time(unittest.TestCase):
+class TestIso8601Time(testtools.TestCase):
 
     def _instaneous(self, timestamp, yr, mon, day, hr, min, sec, micro):
         self.assertEquals(timestamp.year, yr)