redis/hiredis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests

Browse Source 
Fix tests so they work for Redis 7.0
This commit is contained in:
Michael Grunder 2022-06-26 12:18:54 -07:00 committed by GitHub
commit 5d68ad2f48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View File

@ -152,7 +152,8 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
brew install openssl redis brew install openssl redis@6.2
brew link redis@6.2 --force
- name: Build hiredis - name: Build hiredis
run: USE_SSL=1 make run: USE_SSL=1 make

9
test.sh
View File

@ -5,9 +5,16 @@ REDIS_PORT=${REDIS_PORT:-56379}
REDIS_SSL_PORT=${REDIS_SSL_PORT:-56443} REDIS_SSL_PORT=${REDIS_SSL_PORT:-56443}
TEST_SSL=${TEST_SSL:-0} TEST_SSL=${TEST_SSL:-0}
SKIPS_AS_FAILS=${SKIPS_AS_FAILS-:0} SKIPS_AS_FAILS=${SKIPS_AS_FAILS-:0}
ENABLE_DEBUG_CMD=
SSL_TEST_ARGS= SSL_TEST_ARGS=
SKIPS_ARG= SKIPS_ARG=
# We need to enable the DEBUG command for redis-server >= 7.0.0
REDIS_MAJOR_VERSION="$(redis-server --version|awk -F'[^0-9]+' '{ print $2 }')"
if [ "$REDIS_MAJOR_VERSION" -gt "6" ]; then
ENABLE_DEBUG_CMD="enable-debug-command local"
fi
tmpdir=$(mktemp -d) tmpdir=$(mktemp -d)
PID_FILE=${tmpdir}/hiredis-test-redis.pid PID_FILE=${tmpdir}/hiredis-test-redis.pid
SOCK_FILE=${tmpdir}/hiredis-test-redis.sock SOCK_FILE=${tmpdir}/hiredis-test-redis.sock
@ -49,8 +56,10 @@ cleanup() {
} }
trap cleanup INT TERM EXIT trap cleanup INT TERM EXIT
cat > ${tmpdir}/redis.conf <<EOF cat > ${tmpdir}/redis.conf <<EOF
daemonize yes daemonize yes
${ENABLE_DEBUG_CMD}
pidfile ${PID_FILE} pidfile ${PID_FILE}
port ${REDIS_PORT} port ${REDIS_PORT}
bind 127.0.0.1 bind 127.0.0.1