Skip to content

Commit a74fa6a

Browse files
vladvildanovuglideIlianIliev
authored
Release 5.2.1 (#3451)
* Migrate to clients test image (#3415) * Migrate to client-testing image - Use clients-testing image for standalone and cluster - Remove hardcoded TLS certificates and keys - Remove stunnel - Remove Cluster docker and configs * Fix migration bugs * Create reusable action to run tests - Reduce copy paste by using reusable action for running tests - Gain better control of tests matrix Add missing actions checkout More fixes in integration workflow Another attempt to fix matrix * Reorg test matrix * Fix jobs names and execution order * Execute standalone and cluster test simultaneously * Streamline test execution - Automatically map Redis version to Redis Stack version and use it for testing module commands - Remove Graph commands from execution by default - Include more Redis versions to the test matrix * More fixes to integration job * Move python compatibility tests to a separate task * Improve run-tests action * Add missing pytest marks for TS tests * Fix cluster configuration * Debug cluster tests * Fix Cluster TLS port * Move current redis version to env var * Fix ssl tests * Show CLUSTER NODES on fail * Fix integration workflow bugs * Add workarounds for IPv6 bug in tests * Use hostname instead of hardcoded IPv4 loopback * Fix bug in _get_client * Fix run-tests action * Fix imports * Add missing version guards in search tests * Add compatibility for Redis < 7 * Add missing version guard in search tests * Fix run-tests * Add missing tls-auth-clients option * Skip module tests when Redis < 7 and RESP3 is enabled * Fix async test_moved_redirection_on_slave_with_default The test was broken for a while after migrating to all-in-one container with Cluster * Cleanup test after debugging * Use correct profile in install_and_test.sh * Use matrix to execute hiredis<=3.0.0 tests * Fix hiredis job * Fix pytest command in install_and_test.sh * Use 7.4.1 as default version in docker-compose.yml * Fix uvloop-tests * Fixed unsecured tempfile.mktemp() command usage (#3446) * Fixed unsecured tempfile.mktemp() command usage * Added proper tuple handling * Fixed bug with SLOWLOG GET response parsing from Redis Enterprise (#3441) * Fixed issue with invoking _close() on closed event loop (#3438) * Fixed issue with invoking _close() on closed event loop * Removed unused import * Revert weakref changes * Codestyle fix * Added test coverage * Codestyle fixes * Codestyle fixes * Removed failure check that fails in 3.12 * Codestyle fixes * Codestyle fixes * Fixing randomly failing test (#3437) * Fixing randomly failing test * Always rounding up to avoid randomly failing tests * Always rounding up to avoid randomly failing tests --------- Co-authored-by: Vladyslav Vildanov <[email protected]> * Updated package version --------- Co-authored-by: Igor Malinovskiy <[email protected]> Co-authored-by: Ilian Iliev <[email protected]>
1 parent 166ae7b commit a74fa6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+559
-620
lines changed

‎.github/actions/run-tests/action.yml‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
name: 'Run redis-py tests'
2+
description: 'Runs redis-py tests against different Redis versions and configurations'
3+
inputs:
4+
python-version:
5+
description: 'Python version to use for running tests'
6+
default: '3.12'
7+
parser-backend:
8+
description: 'Parser backend to use: plain or hiredis'
9+
required: true
10+
redis-version:
11+
description: 'Redis version to test against'
12+
required: true
13+
hiredis-version:
14+
description: 'hiredis version to test against'
15+
required: false
16+
default: '>3.0.0'
17+
event-loop:
18+
description: 'Event loop to use'
19+
required: false
20+
default: 'asyncio'
21+
runs:
22+
using: "composite"
23+
steps:
24+
- uses: actions/checkout@v4
25+
26+
- uses: actions/setup-python@v5
27+
with:
28+
python-version: ${{ inputs.python-version }}
29+
cache: 'pip'
30+
31+
- name: Setup Test environment
32+
env:
33+
REDIS_VERSION: ${{ inputs.redis-version }}
34+
REDIS_IMAGE: "redis:${{ inputs.redis-version }}"
35+
CLIENT_LIBS_TEST_IMAGE: "redislabs/client-libs-test:${{ inputs.redis-version }}"
36+
run: |
37+
set -e
38+
39+
echo "::group::Installing dependencies"
40+
pip install -U setuptools wheel
41+
pip install -r requirements.txt
42+
pip install -r dev_requirements.txt
43+
if [ "${{inputs.parser-backend}}" == "hiredis" ]; then
44+
pip install "hiredis${{inputs.hiredis-version}}"
45+
echo "PARSER_BACKEND=$(echo "${{inputs.parser-backend}}_${{inputs.hiredis-version}}" | sed 's/[^a-zA-Z0-9]/_/g')" >> $GITHUB_ENV
46+
else
47+
echo "PARSER_BACKEND=${{inputs.parser-backend}}" >> $GITHUB_ENV
48+
fi
49+
echo "::endgroup::"
50+
51+
echo "::group::Starting Redis servers"
52+
redis_major_version=$(echo "$REDIS_VERSION" | grep -oP '^\d+')
53+
54+
if (( redis_major_version < 8 )); then
55+
echo "Using redis-stack for module tests"
56+
57+
# Mapping of redis version to stack version
58+
declare -A redis_stack_version_mapping=(
59+
["7.4.1"]="7.4.0-v1"
60+
["7.2.6"]="7.2.0-v13"
61+
["6.2.16"]="6.2.6-v17"
62+
)
63+
64+
if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
65+
export REDIS_STACK_IMAGE="redis/redis-stack-server:${redis_stack_version_mapping[$REDIS_VERSION]}"
66+
echo "REDIS_MOD_URL=redis://127.0.0.1:6479/0" >> $GITHUB_ENV
67+
else
68+
echo "Version not found in the mapping."
69+
exit 1
70+
fi
71+
72+
if (( redis_major_version < 7 )); then
73+
export REDIS_STACK_EXTRA_ARGS="--tls-auth-clients optional --save ''"
74+
export REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"
75+
echo "REDIS_MAJOR_VERSION=${redis_major_version}" >> $GITHUB_ENV
76+
fi
77+
78+
invoke devenv --endpoints=all-stack
79+
else
80+
echo "Using redis CE for module tests"
81+
echo "REDIS_MOD_URL=redis://127.0.0.1:6379" >> $GITHUB_ENV
82+
invoke devenv --endpoints all
83+
fi
84+
85+
sleep 10 # time to settle
86+
echo "::endgroup::"
87+
shell: bash
88+
89+
- name: Run tests
90+
run: |
91+
set -e
92+
93+
run_tests() {
94+
local protocol=$1
95+
local eventloop=""
96+
97+
if [ "${{inputs.event-loop}}" == "uvloop" ]; then
98+
eventloop="--uvloop"
99+
fi
100+
101+
echo "::group::RESP${protocol} standalone tests"
102+
echo "REDIS_MOD_URL=${REDIS_MOD_URL}"
103+
104+
if (( $REDIS_MAJOR_VERSION < 7 )) && [ "$protocol" == "3" ]; then
105+
echo "Skipping module tests: Modules doesn't support RESP3 for Redis versions < 7"
106+
invoke standalone-tests --redis-mod-url=${REDIS_MOD_URL} $eventloop --protocol="${protocol}" --extra-markers="not redismod"
107+
else
108+
invoke standalone-tests --redis-mod-url=${REDIS_MOD_URL} $eventloop --protocol="${protocol}"
109+
fi
110+
111+
echo "::endgroup::"
112+
113+
if [ "$protocol" == "2" ] || [ "${{inputs.parser-backend}}" != 'hiredis' ]; then
114+
echo "::group::RESP${protocol} cluster tests"
115+
invoke cluster-tests $eventloop --protocol=${protocol}
116+
echo "::endgroup::"
117+
fi
118+
}
119+
120+
run_tests 2 "${{inputs.event-loop}}"
121+
run_tests 3 "${{inputs.event-loop}}"
122+
shell: bash
123+
124+
- name: Debug
125+
if: failure()
126+
run: |
127+
sudo apt-get install -y redis-tools
128+
echo "Docker Containers:"
129+
docker ps
130+
redis-cli -p 16379 CLUSTER NODES
131+
shell: bash
132+
133+
- name: Upload test results and profiling data
134+
uses: actions/upload-artifact@v4
135+
with:
136+
name: pytest-results-redis_${{inputs.redis-version}}-python_${{inputs.python-version}}-parser_${{env.PARSER_BACKEND}}-el_${{inputs.event-loop}}
137+
path: |
138+
*-results.xml
139+
prof/**
140+
profile_output*
141+
if-no-files-found: error
142+
retention-days: 10
143+
144+
- name: Upload codecov coverage
145+
uses: codecov/codecov-action@v4
146+
with:
147+
fail_ci_if_error: false

‎.github/workflows/install_and_test.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ python -m venv ${DESTENV}
2121
source ${DESTENV}/bin/activate
2222
pip install --upgrade --quiet pip
2323
pip install --quiet -r dev_requirements.txt
24-
invoke devenv
24+
invoke devenv --endpoints=all-stack
2525
invoke package
2626

2727
# find packages
@@ -39,7 +39,9 @@ cd ${TESTDIR}
3939
# install, run tests
4040
pip install ${PKG}
4141
# Redis tests
42-
pytest -m 'not onlycluster'
42+
pytest -m 'not onlycluster and not graph'
4343
# RedisCluster tests
4444
CLUSTER_URL="redis://localhost:16379/0"
45-
pytest -m 'not onlynoncluster and not redismod and not ssl' --redis-url=${CLUSTER_URL}
45+
CLUSTER_SSL_URL="rediss://localhost:27379/0"
46+
pytest -m 'not onlynoncluster and not redismod and not ssl and not graph' \
47+
--redis-url="${CLUSTER_URL}" --redis-ssl-url="${CLUSTER_SSL_URL}"

0 commit comments

Comments
 (0)