Fix xadd timestamp

* Fixed xadd timestamp * Add test for redis7+ Fix #151 --------- Co-authored-by: Daniel M <[email protected]>
cunla · May 19, 2023 · cc8709f · cc8709f
1 parent 053ae9e
commit cc8709f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/fakeredis/_stream.py b/fakeredis/_stream.py
@@ -48,7 +48,7 @@ def add(self, fields: List, id_str: str = '*') -> Union[None, bytes]:
             id_str = id_str.decode()
 
         if id_str is None or id_str == '*':
-            ts, seq = int(time.time() + 1), 0
+            ts, seq = int(1000 * time.time()), 0
             if (len(self._values) > 0
                     and self._values[-1][0][0] == ts
                     and self._values[-1][0][1] >= seq):

diff --git a/test/test_mixins/test_streams_commands.py b/test/test_mixins/test_streams_commands.py
@@ -1,5 +1,6 @@
 import pytest
 import redis
+import time
 
 from fakeredis._stream import XStream
 from test import testtools
@@ -44,11 +45,14 @@ def test_xstream(r):
 @pytest.mark.max_server('6.3')
 def test_xadd_redis6(r: redis.Redis):
     stream = "stream"
+    before = time.time()
     m1 = r.xadd(stream, {"some": "other"})
+    after = time.time()
     ts1, seq1 = m1.decode().split('-')
     seq1 = int(seq1)
     m2 = r.xadd(stream, {'add': 'more'}, id=f'{ts1}-{seq1 + 1}')
     ts2, seq2 = m2.decode().split('-')
+    assert int(1000 * before) <= int(ts1) <= int(1000 * after)
     assert ts1 == ts2
     assert int(seq2) == int(seq1) + 1
 
@@ -65,10 +69,13 @@ def test_xadd_redis6(r: redis.Redis):
 @pytest.mark.min_server('7')
 def test_xadd_redis7(r: redis.Redis):
     stream = "stream"
+    before = time.time()
     m1 = r.xadd(stream, {"some": "other"})
-    ts1, seq1 = m1.decode().split('-')
+    after = time.time()
     m2 = r.xadd(stream, {'add': 'more'}, id=f'{ts1}-*')
+    ts1, seq1 = m1.decode().split('-')
     ts2, seq2 = m2.decode().split('-')
+    assert int(1000 * before) <= int(ts1) <= int(1000 * after)
     assert ts1 == ts2
     assert int(seq2) == int(seq1) + 1