Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update with latest changes to redis-rs. #312

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Update with latest changes to redis-rs. #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12f2e8
Update with latest changes to redis-rs.
shachlanAmazon Jul 10, 2023
9136227
fix python tests
shachlanAmazon Jul 12, 2023
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
21 changes: 15 additions & 6 deletions python/python/tests/test_async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import random
import string
from datetime import datetime, timedelta
from typing import Dict
from typing import Dict, List

import pytest
from packaging import version
Expand Down Expand Up @@ -42,7 +42,12 @@ async def async_socket_client(request, cluster_mode) -> RedisAsyncSocketClient:
client.close()


def parse_info_response(res: str) -> Dict[str, str]:
def to_str(res: str | List[str]) -> str:
return res[0] if isinstance(res, list) else res
Copy link
Collaborator

@barshaul barshaul Jul 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

res can also be None, and the function can return None.
change to str(res) if res else None



def parse_info_response(res: str | List[str]) -> Dict[str, str]:
res = to_str(res)
info_lines = [
line for line in res.splitlines() if line and not line.startswith("#")
]
Expand Down Expand Up @@ -170,8 +175,10 @@ async def test_custom_command_multi_arg(
self, async_socket_client: RedisAsyncSocketClient
):
# Test multi args command
res: str = await async_socket_client.custom_command(
["CLIENT", "LIST", "TYPE", "NORMAL"]
res: str = to_str(
await async_socket_client.custom_command(
["CLIENT", "LIST", "TYPE", "NORMAL"]
)
)
assert res is not None
assert "id" in res
Expand All @@ -182,8 +189,10 @@ async def test_custom_command_lower_and_upper_case(
self, async_socket_client: RedisAsyncSocketClient
):
# Test multi args command
res: str = await async_socket_client.custom_command(
["client", "LIST", "type", "NORMAL"]
res: str = to_str(
await async_socket_client.custom_command(
["client", "LIST", "type", "NORMAL"]
)
)
assert res is not None
assert "id" in res
Expand Down
2 changes: 1 addition & 1 deletion submodules/redis-rs
Open in desktop
Submodule redis-rs updated 20 files
+10 −6 .github/workflows/rust.yml
+3 −0 redis-test/Cargo.toml
+3 −0 redis/Cargo.toml
+16 −21 redis/benches/bench_basic.rs
+41 −10 redis/src/aio/connection.rs
+31 −27 redis/src/cluster.rs
+240 −106 redis/src/cluster_async/mod.rs
+65 −7 redis/src/cluster_client.rs
+41 −15 redis/src/cluster_routing.rs
+94 −1 redis/src/commands/mod.rs
+6 −2 redis/src/lib.rs
+22 −0 redis/src/types.rs
+21 −1 redis/tests/support/cluster.rs
+68 −52 redis/tests/support/mock_cluster.rs
+13 −5 redis/tests/support/mod.rs
+10 −0 redis/tests/support/util.rs
+52 −2 redis/tests/test_basic.rs
+94 −0 redis/tests/test_cluster.rs
+96 −3 redis/tests/test_cluster_async.rs
+0 −10 redis/tests/test_streams.rs
Loading