diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-04 15:48:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-04 15:48:59 +0000 |
| commit | cad152f0f0593145f3d711b34714758b604415df (patch) | |
| tree | 92c6a5256a6a96df04cea99201e7398f25b14343 /tests | |
| parent | 8ed3163c2b3f372402e6bccf7df5f3f3222d8c98 (diff) | |
| parent | 09b341db792fa25fe67c560c65f278ce9c70957e (diff) | |
| download | oslo-cad152f0f0593145f3d711b34714758b604415df.tar.gz oslo-cad152f0f0593145f3d711b34714758b604415df.tar.xz oslo-cad152f0f0593145f3d711b34714758b604415df.zip | |
Merge "Make time comparison functions accept strings"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/test_timeutils.py | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/tests/unit/test_timeutils.py b/tests/unit/test_timeutils.py index b5cd898..1407f29 100644 --- a/tests/unit/test_timeutils.py +++ b/tests/unit/test_timeutils.py @@ -65,26 +65,48 @@ class TimeUtilsTest(unittest.TestCase): t = timeutils.parse_strtime(s) self.assertEqual(orig_t, t) - def test_is_older_than(self): + def _test_is_older_than(self, fn): + strptime = datetime.datetime.strptime with mock.patch('datetime.datetime') as datetime_mock: datetime_mock.utcnow.return_value = self.skynet_self_aware_time - expect_true = timeutils.is_older_than(self.one_minute_before, 59) + datetime_mock.strptime = strptime + expect_true = timeutils.is_older_than(fn(self.one_minute_before), + 59) self.assertTrue(expect_true) - expect_false = timeutils.is_older_than(self.one_minute_before, 60) + expect_false = timeutils.is_older_than(fn(self.one_minute_before), + 60) self.assertFalse(expect_false) - expect_false = timeutils.is_older_than(self.one_minute_before, 61) + expect_false = timeutils.is_older_than(fn(self.one_minute_before), + 61) self.assertFalse(expect_false) - def test_is_newer_than(self): + def test_is_older_than_datetime(self): + self._test_is_older_than(lambda x: x) + + def test_is_older_than_str(self): + self._test_is_older_than(timeutils.strtime) + + def _test_is_newer_than(self, fn): + strptime = datetime.datetime.strptime with mock.patch('datetime.datetime') as datetime_mock: datetime_mock.utcnow.return_value = self.skynet_self_aware_time - expect_true = timeutils.is_newer_than(self.one_minute_after, 59) + datetime_mock.strptime = strptime + expect_true = timeutils.is_newer_than(fn(self.one_minute_after), + 59) self.assertTrue(expect_true) - expect_false = timeutils.is_newer_than(self.one_minute_after, 60) + expect_false = timeutils.is_newer_than(fn(self.one_minute_after), + 60) self.assertFalse(expect_false) - expect_false = timeutils.is_newer_than(self.one_minute_after, 61) + expect_false = timeutils.is_newer_than(fn(self.one_minute_after), + 61) self.assertFalse(expect_false) + def test_is_newer_than_datetime(self): + self._test_is_newer_than(lambda x: x) + + def test_is_newer_than_str(self): + self._test_is_newer_than(timeutils.strtime) + def test_utcnow_ts(self): skynet_self_aware_timestamp = 872835240 dt = datetime.datetime.utcfromtimestamp(skynet_self_aware_timestamp) |