Skip to content
Open
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
6 changes: 4 additions & 2 deletions fakeredis/_tcp_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ def load(self) -> Any:
array[i] = self.load()
return array
if prefix == b"$":
bulk_string = self.reader.read(int(rest) + 2).strip()
if len(bulk_string) != int(rest):
length = int(rest)
bulk_string = self.reader.read(length)
terminator = self.reader.read(2)
if len(bulk_string) != length or terminator != b"\r\n":
raise ValueError()
return bulk_string
if prefix == b":":
Expand Down
75 changes: 75 additions & 0 deletions test/test_tcp_server/test_reader.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import time
from threading import Thread

import redis

from fakeredis import TcpFakeServer
from test import testtools


@testtools.run_test_if_lupa_installed()
def test_eval_multiline_script():
"""Test that EVAL works with multi-line Lua scripts."""
server_address = ("127.0.0.1", 19000)
server = TcpFakeServer(server_address)
t = Thread(target=server.serve_forever, daemon=True)
t.start()
time.sleep(0.1)

with redis.Redis(host=server_address[0], port=server_address[1]) as r:
# Multi-line script with trailing newline
script = """
local key = KEYS[1]
local value = ARGV[1]
redis.call('SET', key, value)
return redis.call('GET', key)
"""
result = r.eval(script, 1, "testkey", "testvalue")
assert result == b"testvalue"

server.server_close()
server.shutdown()
t.join()


@testtools.run_test_if_lupa_installed()
def test_script_load_multiline():
"""Test that SCRIPT LOAD works with multi-line Lua scripts."""
server_address = ("127.0.0.1", 19001)
server = TcpFakeServer(server_address)
t = Thread(target=server.serve_forever, daemon=True)
t.start()
time.sleep(0.1)

with redis.Redis(host=server_address[0], port=server_address[1]) as r:
# Multi-line script
script = """local x = 1
local y = 2
return x + y"""
sha = r.script_load(script)
result = r.evalsha(sha, 0)
assert result == 3

server.server_close()
server.shutdown()
t.join()


@testtools.run_test_if_lupa_installed()
def test_eval_script_with_trailing_newline():
"""Test that scripts with trailing newlines are preserved."""
server_address = ("127.0.0.1", 19002)
server = TcpFakeServer(server_address)
t = Thread(target=server.serve_forever, daemon=True)
t.start()
time.sleep(0.1)

with redis.Redis(host=server_address[0], port=server_address[1]) as r:
# Script with explicit trailing newline
script = "return 'hello'\n"
result = r.eval(script, 0)
assert result == b"hello"

server.server_close()
server.shutdown()
t.join()
Loading