diff options
author | Zhongyue Luo <zhongyue.nah@intel.com> | 2014-02-12 11:14:35 +0800 |
---|---|---|
committer | Zhongyue Luo <zhongyue.nah@intel.com> | 2014-02-18 08:13:34 +0800 |
commit | 3f04998f6f3a6d6c04da8fe3fa7170088f420dd8 (patch) | |
tree | c34dd4fb40ec0206451885ef4129bf62576e8140 /tests/unit/cache | |
parent | ddc1a633241841caff0a317c39585ece3dbe2630 (diff) | |
download | oslo-incubator-3f04998f6f3a6d6c04da8fe3fa7170088f420dd8.tar.gz |
Removes use of timeutils.set_time_override
The set_time_override function in timeutils was written as a
helper function to mock utcnow for unittests before 'mock' was
generally used. Now that we have mock and fixture, we no longer
need to use it.
Change-Id: If6532efe7f3edc91ca3394793a5cc6d4b9435655
Diffstat (limited to 'tests/unit/cache')
-rw-r--r-- | tests/unit/cache/test_memory.py | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/tests/unit/cache/test_memory.py b/tests/unit/cache/test_memory.py index c3b72789..52975c37 100644 --- a/tests/unit/cache/test_memory.py +++ b/tests/unit/cache/test_memory.py @@ -12,9 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -import datetime +import time + +import mock -from openstack.common import timeutils from tests.unit.cache import base @@ -28,55 +29,51 @@ class MemorycacheTest(base.CacheBaseTest): cache_url = 'memory://' def test_timeout(self): - try: - now = datetime.datetime.utcnow() - timeutils.set_time_override(now) + now = time.time() + with mock.patch('time.time') as time_mock: + time_mock.return_value = now self.client.set('foo', 'bar', ttl=3) - timeutils.set_time_override(now + datetime.timedelta(seconds=1)) + time_mock.return_value = now + 1 self.assertEqual(self.client.get('foo'), 'bar') - timeutils.set_time_override(now + datetime.timedelta(seconds=3)) + time_mock.return_value = now + 3 self.assertIsNone(self.client.get('foo')) - finally: - timeutils.clear_time_override() def test_timeout_unset(self): - try: - now = datetime.datetime.utcnow() - timeutils.set_time_override(now) + now = time.time() + with mock.patch('time.time') as time_mock: + time_mock.return_value = now self.client.set('foo', 'bar', ttl=3) self.client.set('fooo', 'bar', ttl=4) self.client.set('foooo', 'bar', ttl=5) self.client.set('fooooo', 'bar', ttl=6) - timeutils.set_time_override(now + datetime.timedelta(seconds=1)) + time_mock.return_value = now + 1 self.assertEqual(self.client.get('foo'), 'bar') self.assertEqual(self.client.get('fooo'), 'bar') self.assertEqual(self.client.get('foooo'), 'bar') self.assertEqual(self.client.get('fooooo'), 'bar') - timeutils.set_time_override(now + datetime.timedelta(seconds=5)) + time_mock.return_value = now + 5 del self.client['foo'] self.assertIsNone(self.client.get('foo')) self.assertIsNone(self.client.get('fooo')) self.assertIsNone(self.client.get('foooo')) self.assertEqual(self.client.get('fooooo'), 'bar') - finally: - timeutils.clear_time_override() def test_timeout_unset_pop(self): - try: - now = datetime.datetime.utcnow() - timeutils.set_time_override(now) + now = time.time() + with mock.patch('time.time') as time_mock: + time_mock.return_value = now self.client.set('foo', 'bar', ttl=3) self.client.set('fooo', 'bar', ttl=4) self.client.set('foooo', 'bar', ttl=5) self.client.set('fooooo', 'bar', ttl=6) - timeutils.set_time_override(now + datetime.timedelta(seconds=1)) + time_mock.return_value = now + 1 self.assertEqual(self.client.get('foo'), 'bar') self.assertEqual(self.client.get('fooo'), 'bar') self.assertEqual(self.client.get('foooo'), 'bar') self.assertEqual(self.client.get('fooooo'), 'bar') - timeutils.set_time_override(now + datetime.timedelta(seconds=4)) + time_mock.return_value = now + 4 # NOTE(flaper87): Let unset delete foooo and timeout # expire foo and fooo. @@ -85,5 +82,3 @@ class MemorycacheTest(base.CacheBaseTest): self.assertIsNone(self.client.get('fooo')) self.assertIsNone(self.client.get('foooo')) self.assertEqual(self.client.get('fooooo'), 'bar') - finally: - timeutils.clear_time_override() |