Skip to content

Commit c4dbb0f

Browse files
cunlacunla
committed
fix:tests
1 parent bd7a58a commit c4dbb0f

File tree

3 files changed

+22
-174
lines changed

3 files changed

+22
-174
lines changed

‎test/test_json/test_json_commands.py

Lines changed: 0 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
from typing import (Any, Dict, List, Tuple, )
66

77
import pytest
8-
import redis
9-
from redis.commands.json.path import Path
108

119
json_tests = pytest.importorskip("jsonpath_ng")
1210

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

6462

65-
@pytest.mark.xfail
66-
def test_debug(r: redis.Redis):
67-
r.json().set("str", Path.root_path(), "foo")
68-
assert 24 == r.json().debug("MEMORY", "str", Path.root_path())
69-
assert 24 == r.json().debug("MEMORY", "str")
70-
71-
# technically help is valid
72-
assert isinstance(r.json().debug("HELP"), list)
73-
74-
75-
@pytest.mark.xfail
76-
def test_resp(r: redis.Redis):
77-
obj = {"foo": "bar", "baz": 1, "qaz": True, }
78-
r.json().set("obj", Path.root_path(), obj, )
79-
80-
assert "bar" == r.json().resp("obj", Path("foo"), )
81-
assert 1 == r.json().resp("obj", Path("baz"), )
82-
assert r.json().resp(
83-
"obj",
84-
Path("qaz"),
85-
)
86-
assert isinstance(r.json().resp("obj"), list)
87-
88-
8963
def load_types_data(nested_key_name: str) -> Tuple[Dict[str, Any], List[bytes]]:
9064
"""Generate a structure with sample of all types
9165
"""
@@ -104,129 +78,3 @@ def load_types_data(nested_key_name: str) -> Tuple[Dict[str, Any], List[bytes]]:
10478
jdata[f"nested_{k}"] = {nested_key_name: v}
10579

10680
return jdata, [k.encode() for k in type_samples.keys()]
107-
108-
109-
@pytest.mark.xfail
110-
def test_debug_dollar(r: redis.Redis):
111-
jdata, jtypes = load_types_data("a")
112-
113-
r.json().set("doc1", "$", jdata)
114-
115-
# Test multi
116-
assert r.json().debug("MEMORY", "doc1", "$..a") == [72, 24, 24, 16, 16, 1, 0]
117-
118-
# Test single
119-
assert r.json().debug("MEMORY", "doc1", "$.nested2.a") == [24]
120-
121-
# Test legacy
122-
assert r.json().debug("MEMORY", "doc1", "..a") == 72
123-
124-
# Test missing path (defaults to root)
125-
assert r.json().debug("MEMORY", "doc1") == 72
126-
127-
# Test missing key
128-
assert r.json().debug("MEMORY", "non_existing_doc", "$..a") == []
129-
130-
131-
@pytest.mark.xfail
132-
def test_resp_dollar(r: redis.Redis, json_data: Dict[str, Any]):
133-
r.json().set("doc1", "$", json_data)
134-
135-
# Test multi
136-
res = r.json().resp("doc1", "$..a")
137-
138-
assert res == [
139-
[
140-
"{",
141-
"A1_B1",
142-
10,
143-
"A1_B2",
144-
"false",
145-
"A1_B3",
146-
[
147-
"{",
148-
"A1_B3_C1",
149-
None,
150-
"A1_B3_C2",
151-
[
152-
"[",
153-
"A1_B3_C2_D1_1",
154-
"A1_B3_C2_D1_2",
155-
"-19.5",
156-
"A1_B3_C2_D1_4",
157-
"A1_B3_C2_D1_5",
158-
["{", "A1_B3_C2_D1_6_E1", "true"],
159-
],
160-
"A1_B3_C3",
161-
["[", 1],
162-
],
163-
"A1_B4",
164-
["{", "A1_B4_C1", "foo"],
165-
],
166-
[
167-
"{",
168-
"A2_B1",
169-
20,
170-
"A2_B2",
171-
"false",
172-
"A2_B3",
173-
[
174-
"{",
175-
"A2_B3_C1",
176-
None,
177-
"A2_B3_C2",
178-
[
179-
"[",
180-
"A2_B3_C2_D1_1",
181-
"A2_B3_C2_D1_2",
182-
"-37.5",
183-
"A2_B3_C2_D1_4",
184-
"A2_B3_C2_D1_5",
185-
["{", "A2_B3_C2_D1_6_E1", "false"],
186-
],
187-
"A2_B3_C3",
188-
["[", 2],
189-
],
190-
"A2_B4",
191-
["{", "A2_B4_C1", "bar"],
192-
],
193-
]
194-
195-
# Test single
196-
res_single = r.json().resp("doc1", "$.L1.a")
197-
assert res_single == [
198-
[
199-
"{",
200-
"A1_B1",
201-
10,
202-
"A1_B2",
203-
"false",
204-
"A1_B3",
205-
[
206-
"{",
207-
"A1_B3_C1",
208-
None,
209-
"A1_B3_C2",
210-
[
211-
"[",
212-
"A1_B3_C2_D1_1",
213-
"A1_B3_C2_D1_2",
214-
"-19.5",
215-
"A1_B3_C2_D1_4",
216-
"A1_B3_C2_D1_5",
217-
["{", "A1_B3_C2_D1_6_E1", "true"],
218-
],
219-
"A1_B3_C3",
220-
["[", 1],
221-
],
222-
"A1_B4",
223-
["{", "A1_B4_C1", "foo"],
224-
]
225-
]
226-
227-
# Test missing path
228-
r.json().resp("doc1", "$.nowhere")
229-
230-
# Test missing key
231-
# with pytest.raises(exceptions.ResponseError):
232-
r.json().resp("non_existing_doc", "$..a")

‎test/test_mixins/test_server_commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def test_command(r: redis.Redis):
5050
assert one_word_commands - set(commands_dict.keys()) == set()
5151

5252

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

5656

5757
@pytest.mark.slow

‎test/test_scan.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,26 @@ def test_scan_delete_unseen_key_while_scanning_should_not_returns_it_in_scan(r:
6767
assert key_to_remove not in keys
6868

6969

70-
@pytest.mark.xfail
71-
def test_scan_delete_seen_key_while_scanning_should_return_all_keys(r: redis.Redis):
72-
size = 30
73-
all_keys_dict = key_val_dict(size=size)
74-
assert all(r.set(k, v) for k, v in all_keys_dict.items())
75-
assert len(r.keys()) == size
76-
77-
cursor, keys = r.scan()
78-
79-
key_to_remove = keys[0]
80-
assert r.delete(keys[0]) == 1
81-
assert r.get(key_to_remove) is None
82-
while cursor != 0:
83-
cursor, data = r.scan(cursor=cursor)
84-
keys.extend(data)
85-
86-
assert len(set(keys)) == len(keys)
87-
keys = set(keys)
88-
assert len(keys) == size, f"{set(all_keys_dict).difference(keys)} is not empty but should be"
89-
assert key_to_remove in keys
70+
# @pytest.mark.xfail # todo
71+
# def test_scan_delete_seen_key_while_scanning_should_return_all_keys(r: redis.Redis):
72+
# size = 30
73+
# all_keys_dict = key_val_dict(size=size)
74+
# assert all(r.set(k, v) for k, v in all_keys_dict.items())
75+
# assert len(r.keys()) == size
76+
#
77+
# cursor, keys = r.scan()
78+
#
79+
# key_to_remove = keys[0]
80+
# assert r.delete(keys[0]) == 1
81+
# assert r.get(key_to_remove) is None
82+
# while cursor != 0:
83+
# cursor, data = r.scan(cursor=cursor)
84+
# keys.extend(data)
85+
#
86+
# assert len(set(keys)) == len(keys)
87+
# keys = set(keys)
88+
# assert len(keys) == size, f"{set(all_keys_dict).difference(keys)} is not empty but should be"
89+
# assert key_to_remove in keys
9090

9191

9292
def test_scan_add_key_while_scanning_should_return_all_keys(r: redis.Redis):

0 commit comments

Comments
 (0)