@@ -14,6 +14,10 @@ inputs:
1414 description : ' hiredis version to test against'
1515 required : false
1616 default : ' >3.0.0'
17+ hiredis-branch :
18+ description : ' hiredis branch to test against'
19+ required : false
20+ default : ' master'
1721 event-loop :
1822 description : ' Event loop to use'
1923 required : false
@@ -28,94 +32,106 @@ runs:
2832 python-version : ${{ inputs.python-version }}
2933 cache : ' pip'
3034
35+ - uses : actions/checkout@v4
36+ if : ${{ inputs.parser-backend == 'hiredis' && inputs.hiredis-version == 'unstable' }}
37+ with :
38+ repository : redis/hiredis-py
39+ submodules : true
40+ path : hiredis-py
41+ ref : ${{ inputs.hiredis-branch }}
42+
3143 - name : Setup Test environment
3244 env :
3345 REDIS_VERSION : ${{ inputs.redis-version }}
3446 CLIENT_LIBS_TEST_IMAGE_TAG : ${{ inputs.redis-version }}
3547 run : |
3648 set -e
37-
49+
3850 echo "::group::Installing dependencies"
39- pip install -U setuptools wheel
40- pip install -r requirements.txt
4151 pip install -r dev_requirements.txt
52+ pip uninstall -y redis # uninstall Redis package installed via redis-entraid
53+ pip install -e .[jwt] # install the working copy
4254 if [ "${{inputs.parser-backend}}" == "hiredis" ]; then
43- pip install "hiredis${{inputs.hiredis-version}}"
44- echo "PARSER_BACKEND=$(echo "${{inputs.parser-backend}}_${{inputs.hiredis-version}}" | sed 's/[^a-zA-Z0-9]/_/g')" >> $GITHUB_ENV
55+ if [[ "${{inputs.hiredis-version}}" == "unstable" ]]; then
56+ echo "Installing unstable version of hiredis from local directory"
57+ pip install -e ./hiredis-py
58+ else
59+ pip install "hiredis${{inputs.hiredis-version}}"
60+ fi
61+ echo "PARSER_BACKEND=$(echo "${{inputs.parser-backend}}_${{inputs.hiredis-version}}" | sed 's/[^a-zA-Z0-9]/_/g')" >> $GITHUB_ENV
4562 else
4663 echo "PARSER_BACKEND=${{inputs.parser-backend}}" >> $GITHUB_ENV
4764 fi
4865 echo "::endgroup::"
49-
66+
5067 echo "::group::Starting Redis servers"
5168 redis_major_version=$(echo "$REDIS_VERSION" | grep -oP '^\d+')
52-
69+ echo "REDIS_MAJOR_VERSION=${redis_major_version}" >> $GITHUB_ENV
70+
5371 if (( redis_major_version < 8 )); then
5472 echo "Using redis-stack for module tests"
55-
56- # Mapping of redis version to stack version
73+
74+ # Mapping of redis version to stack version
5775 declare -A redis_stack_version_mapping=(
58- ["7.4.2"]="rs-7.4.0-v2"
59- ["7.2.7"]="rs-7.2.0-v14"
60- ["6.2.17"]="rs-6.2.6-v18"
76+ ["7.4.4"]="rs-7.4.0-v5"
77+ ["7.2.9"]="rs-7.2.0-v17"
6178 )
62-
79+
6380 if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
6481 export CLIENT_LIBS_TEST_STACK_IMAGE_TAG=${redis_stack_version_mapping[$REDIS_VERSION]}
6582 echo "REDIS_MOD_URL=redis://127.0.0.1:6479/0" >> $GITHUB_ENV
6683 else
6784 echo "Version not found in the mapping."
6885 exit 1
6986 fi
70-
87+
7188 if (( redis_major_version < 7 )); then
7289 export REDIS_STACK_EXTRA_ARGS="--tls-auth-clients optional --save ''"
7390 export REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"
74- echo "REDIS_MAJOR_VERSION=${redis_major_version}" >> $GITHUB_ENV
7591 fi
76-
92+
7793 invoke devenv --endpoints=all-stack
94+
7895 else
7996 echo "Using redis CE for module tests"
97+ export CLIENT_LIBS_TEST_STACK_IMAGE_TAG=$REDIS_VERSION
8098 echo "REDIS_MOD_URL=redis://127.0.0.1:6379" >> $GITHUB_ENV
8199 invoke devenv --endpoints all
82- fi
83-
100+ fi
101+
84102 sleep 10 # time to settle
85103 echo "::endgroup::"
86104shell : bash
87105
88106 - name : Run tests
89107 run : |
90108 set -e
91-
109+
92110 run_tests() {
93111 local protocol=$1
94112 local eventloop=""
95-
113+
96114 if [ "${{inputs.event-loop}}" == "uvloop" ]; then
97115 eventloop="--uvloop"
98116 fi
99-
117+
100118 echo "::group::RESP${protocol} standalone tests"
101119 echo "REDIS_MOD_URL=${REDIS_MOD_URL}"
102-
120+
103121 if (( $REDIS_MAJOR_VERSION < 7 )) && [ "$protocol" == "3" ]; then
104122 echo "Skipping module tests: Modules doesn't support RESP3 for Redis versions < 7"
105123 invoke standalone-tests --redis-mod-url=${REDIS_MOD_URL} $eventloop --protocol="${protocol}" --extra-markers="not redismod and not cp_integration"
106- else
124+ else
107125 invoke standalone-tests --redis-mod-url=${REDIS_MOD_URL} $eventloop --protocol="${protocol}"
108126 fi
109-
127+
128+ echo "::endgroup::"
129+
130+ echo "::group::RESP${protocol} cluster tests"
131+ invoke cluster-tests $eventloop --protocol=${protocol}
110132 echo "::endgroup::"
111-
112- if [ "$protocol" == "2" ] || [ "${{inputs.parser-backend}}" != 'hiredis' ]; then
113- echo "::group::RESP${protocol} cluster tests"
114- invoke cluster-tests $eventloop --protocol=${protocol}
115- echo "::endgroup::"
116- fi
117133 }
118-
134+
119135 run_tests 2 "${{inputs.event-loop}}"
120136 run_tests 3 "${{inputs.event-loop}}"
121137shell : bash
0 commit comments