From 827547a0b3da411441bf691ddbc94867001a3311 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 22 Jan 2013 19:54:57 -0500 Subject: Use testtools as test base class. On the path to testr migration, we need to replace the unittest base classes with testtools. Replace tearDown with addCleanup, addCleanup is more resilient than tearDown. The fixtures library has excellent support for managing and cleaning tempfiles. Use it. Replace skip_ with testtools.skipTest Part of blueprint grizzly-testtools. Change-Id: I45e11bbb1ff9b31f3278d3b016737dcb7850cd98 --- tests/unit/test_timeutils.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tests/unit/test_timeutils.py') diff --git a/tests/unit/test_timeutils.py b/tests/unit/test_timeutils.py index 1407f29..0c3c7b4 100644 --- a/tests/unit/test_timeutils.py +++ b/tests/unit/test_timeutils.py @@ -16,17 +16,18 @@ # under the License. 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) @@ -34,9 +35,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: @@ -149,7 +148,7 @@ class TimeUtilsTest(unittest.TestCase): timeutils.delta_seconds(before, after)) -class TestIso8601Time(unittest.TestCase): +class TestIso8601Time(testtools.TestCase): def _instaneous(self, timestamp, yr, mon, day, hr, min, sec, micro): self.assertEquals(timestamp.year, yr) -- cgit