Skip to content

Commit

Permalink
fix:tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@cunla
cunla committed Oct 21, 2023
1 parent bd7a58a commit c4dbb0f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 174 deletions.
152 changes: 0 additions & 152 deletions test/test_json/test_json_commands.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
from typing import (Any, Dict, List, Tuple, )

import pytest
import redis
from redis.commands.json.path import Path

json_tests = pytest.importorskip("jsonpath_ng")

Expand Down Expand Up @@ -62,30 +60,6 @@ def json_data() -> Dict[str, Any]:
}


@pytest.mark.xfail
def test_debug(r: redis.Redis):
r.json().set("str", Path.root_path(), "foo")
assert 24 == r.json().debug("MEMORY", "str", Path.root_path())
assert 24 == r.json().debug("MEMORY", "str")

# technically help is valid
assert isinstance(r.json().debug("HELP"), list)


@pytest.mark.xfail
def test_resp(r: redis.Redis):
obj = {"foo": "bar", "baz": 1, "qaz": True, }
r.json().set("obj", Path.root_path(), obj, )

assert "bar" == r.json().resp("obj", Path("foo"), )
assert 1 == r.json().resp("obj", Path("baz"), )
assert r.json().resp(
"obj",
Path("qaz"),
)
assert isinstance(r.json().resp("obj"), list)


def load_types_data(nested_key_name: str) -> Tuple[Dict[str, Any], List[bytes]]:
"""Generate a structure with sample of all types
"""
Expand All @@ -104,129 +78,3 @@ def load_types_data(nested_key_name: str) -> Tuple[Dict[str, Any], List[bytes]]:
jdata[f"nested_{k}"] = {nested_key_name: v}

return jdata, [k.encode() for k in type_samples.keys()]


@pytest.mark.xfail
def test_debug_dollar(r: redis.Redis):
jdata, jtypes = load_types_data("a")

r.json().set("doc1", "$", jdata)

# Test multi
assert r.json().debug("MEMORY", "doc1", "$..a") == [72, 24, 24, 16, 16, 1, 0]

# Test single
assert r.json().debug("MEMORY", "doc1", "$.nested2.a") == [24]

# Test legacy
assert r.json().debug("MEMORY", "doc1", "..a") == 72

# Test missing path (defaults to root)
assert r.json().debug("MEMORY", "doc1") == 72

# Test missing key
assert r.json().debug("MEMORY", "non_existing_doc", "$..a") == []


@pytest.mark.xfail
def test_resp_dollar(r: redis.Redis, json_data: Dict[str, Any]):
r.json().set("doc1", "$", json_data)

# Test multi
res = r.json().resp("doc1", "$..a")

assert res == [
[
"{",
"A1_B1",
10,
"A1_B2",
"false",
"A1_B3",
[
"{",
"A1_B3_C1",
None,
"A1_B3_C2",
[
"[",
"A1_B3_C2_D1_1",
"A1_B3_C2_D1_2",
"-19.5",
"A1_B3_C2_D1_4",
"A1_B3_C2_D1_5",
["{", "A1_B3_C2_D1_6_E1", "true"],
],
"A1_B3_C3",
["[", 1],
],
"A1_B4",
["{", "A1_B4_C1", "foo"],
],
[
"{",
"A2_B1",
20,
"A2_B2",
"false",
"A2_B3",
[
"{",
"A2_B3_C1",
None,
"A2_B3_C2",
[
"[",
"A2_B3_C2_D1_1",
"A2_B3_C2_D1_2",
"-37.5",
"A2_B3_C2_D1_4",
"A2_B3_C2_D1_5",
["{", "A2_B3_C2_D1_6_E1", "false"],
],
"A2_B3_C3",
["[", 2],
],
"A2_B4",
["{", "A2_B4_C1", "bar"],
],
]

# Test single
res_single = r.json().resp("doc1", "$.L1.a")
assert res_single == [
[
"{",
"A1_B1",
10,
"A1_B2",
"false",
"A1_B3",
[
"{",
"A1_B3_C1",
None,
"A1_B3_C2",
[
"[",
"A1_B3_C2_D1_1",
"A1_B3_C2_D1_2",
"-19.5",
"A1_B3_C2_D1_4",
"A1_B3_C2_D1_5",
["{", "A1_B3_C2_D1_6_E1", "true"],
],
"A1_B3_C3",
["[", 1],
],
"A1_B4",
["{", "A1_B4_C1", "foo"],
]
]

# Test missing path
r.json().resp("doc1", "$.nowhere")

# Test missing key
# with pytest.raises(exceptions.ResponseError):
r.json().resp("non_existing_doc", "$..a")
4 changes: 2 additions & 2 deletions test/test_mixins/test_server_commands.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def test_command(r: redis.Redis):
assert one_word_commands - set(commands_dict.keys()) == set()


def test_command_info(r: redis.Redis):
assert r.command_count() >= len(SUPPORTED_COMMANDS)
def test_command_count(r: redis.Redis):
assert r.command_count() >= len([cmd for cmd in SUPPORTED_COMMANDS if ' ' not in cmd])


@pytest.mark.slow
Expand Down
40 changes: 20 additions & 20 deletions test/test_scan.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,26 @@ def test_scan_delete_unseen_key_while_scanning_should_not_returns_it_in_scan(r:
assert key_to_remove not in keys


@pytest.mark.xfail
def test_scan_delete_seen_key_while_scanning_should_return_all_keys(r: redis.Redis):
size = 30
all_keys_dict = key_val_dict(size=size)
assert all(r.set(k, v) for k, v in all_keys_dict.items())
assert len(r.keys()) == size

cursor, keys = r.scan()

key_to_remove = keys[0]
assert r.delete(keys[0]) == 1
assert r.get(key_to_remove) is None
while cursor != 0:
cursor, data = r.scan(cursor=cursor)
keys.extend(data)

assert len(set(keys)) == len(keys)
keys = set(keys)
assert len(keys) == size, f"{set(all_keys_dict).difference(keys)} is not empty but should be"
assert key_to_remove in keys
# @pytest.mark.xfail # todo
# def test_scan_delete_seen_key_while_scanning_should_return_all_keys(r: redis.Redis):
# size = 30
# all_keys_dict = key_val_dict(size=size)
# assert all(r.set(k, v) for k, v in all_keys_dict.items())
# assert len(r.keys()) == size
#
# cursor, keys = r.scan()
#
# key_to_remove = keys[0]
# assert r.delete(keys[0]) == 1
# assert r.get(key_to_remove) is None
# while cursor != 0:
# cursor, data = r.scan(cursor=cursor)
# keys.extend(data)
#
# assert len(set(keys)) == len(keys)
# keys = set(keys)
# assert len(keys) == size, f"{set(all_keys_dict).difference(keys)} is not empty but should be"
# assert key_to_remove in keys


def test_scan_add_key_while_scanning_should_return_all_keys(r: redis.Redis):
Expand Down

0 comments on commit c4dbb0f

Please sign in to comment.