Skip to content

Commit

Permalink
Merge branch 'url-parsing' of JackiLin:JackiLin/redis-py into url-par…
Browse files Browse the repository at this point in the history
…sing
  • Loading branch information
JackiLin committed Sep 22, 2024
2 parents c2d8c60 + 79c535c commit bda25dc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
max-parallel: 15
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
test-type: ['standalone', 'cluster']
connection-type: ['hiredis', 'plain']
env:
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down
3 changes: 3 additions & 0 deletions tests/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -4964,6 +4964,7 @@ def test_latency_latest(self, r: redis.Redis):
def test_latency_reset(self, r: redis.Redis):
assert r.latency_reset() == 0

@pytest.mark.redismod
@skip_if_server_version_lt("4.0.0")
@skip_if_redis_enterprise()
def test_module_list(self, r):
Expand Down Expand Up @@ -5033,6 +5034,7 @@ def test_command_getkeysandflags(self, r: redis.Redis):
[b"mylist2", [b"RW", b"insert"]],
]

@pytest.mark.redismod
@pytest.mark.onlynoncluster
@skip_if_server_version_lt("4.0.0")
@skip_if_redis_enterprise()
Expand All @@ -5045,6 +5047,7 @@ def test_module(self, stack_r):
stack_r.module_load("/some/fake/path", "arg1", "arg2", "arg3", "arg4")
assert "Error loading the extension." in str(excinfo.value)

@pytest.mark.redismod
@pytest.mark.onlynoncluster
@skip_if_server_version_lt("7.0.0")
@skip_if_redis_enterprise()
Expand Down

0 comments on commit bda25dc

Please sign in to comment.