Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions mockredis/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,16 @@ def exists(self, key):
return self._encode(key) in self.redis
__contains__ = exists

def time(self):
"""
Emulate time

Returns a tuple of the current Unix timestamp, and the amount of
microseconds already elapsed in the current second.
"""
now = datetime.datetime.now()
return int(time.mktime(now.timetuple())), now.microsecond

def _expire(self, key, delta):
if key not in self.redis:
return False
Expand Down
11 changes: 11 additions & 0 deletions mockredis/tests/test_redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,17 @@ def test_incr_init(self):
self.redis.decr('dkey')
eq_(b'-1', self.redis.get('dkey'))

def test_time_format(self):
result = self.redis.time()
ok_(isinstance(result, tuple))
eq_(len(result), 2)

timestampm, millis = result
ok_(isinstance(timestamp, int))
ok_(timestamp > 0)
ok_(isinstance(millis, int))
ok_(millis > 0)

def test_ttl(self):
self.redis.set('key', 'key')
self.redis.expire('key', 30)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from setuptools import setup, find_packages

# Match releases to redis-py versions
__version__ = '2.9.0.11'
__version__ = '2.9.0.12'

# Jenkins will replace __build__ with a unique value.
__build__ = ''
Expand Down