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

Add Redis server 7.2 to the CI matrix #1218

Merged
merged 1 commit into from
Aug 17, 2023
Merged

Add Redis server 7.2 to the CI matrix #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest
env:
LOW_TIMEOUT: "0.01"
REDIS_BRANCH: "7.0"
REDIS_BRANCH: "7.2"
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
runs-on: ubuntu-latest
env:
LOW_TIMEOUT: "0.01"
REDIS_BRANCH: "7.0"
REDIS_BRANCH: "7.2"
TRUFFLERUBYOPT: "--engine.Mode=latency"
steps:
- name: Check out code
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
env:
LOW_TIMEOUT: "0.01"
DRIVER: ${{ matrix.driver }}
REDIS_BRANCH: "7.0"
REDIS_BRANCH: "7.2"
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
strategy:
fail-fast: false
matrix:
redis: ["6.2", "6.0", "5.0"]
redis: ["7.0", "6.2", "6.0", "5.0"]
runs-on: ubuntu-latest
env:
LOW_TIMEOUT: "0.14"
Expand Down
2 changes: 1 addition & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REDIS_BRANCH ?= 7.0
REDIS_BRANCH ?= 7.2
ROOT_DIR :=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
TMP := tmp
CONF := ${ROOT_DIR}/test/support/conf/redis-${REDIS_BRANCH}.conf
Expand Down
2 changes: 1 addition & 1 deletion test/redis/remote_server_control_commands_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def test_object

assert_equal 1, r.object(:refcount, "list")
encoding = r.object(:encoding, "list")
assert encoding == "ziplist" || encoding == "quicklist", "Wrong encoding for list"
assert encoding == "ziplist" || encoding == "quicklist" || encoding == "listpack", "Wrong encoding for list"
assert r.object(:idletime, "list").is_a?(Integer)
end

Expand Down
26 changes: 0 additions & 26 deletions test/redis/scanning_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,32 +127,6 @@ def test_scan_each_block_match
assert all_keys.sort == keys_from_scan.uniq.sort
end

def test_sscan_with_encoding
%i[intset hashtable].each do |enc|
r.del "set"

prefix = ""
prefix = "ele:" if enc == :hashtable

elements = []
100.times { |j| elements << "#{prefix}#{j}" }

r.sadd "set", elements

assert_equal enc.to_s, r.object("encoding", "set")

cursor = 0
all_keys = []
loop do
cursor, keys = r.sscan "set", cursor
all_keys += keys
break if cursor == "0"
end

assert_equal 100, all_keys.uniq.size
end
end

def test_sscan_each_enumerator
elements = []
100.times { |j| elements << "ele:#{j}" }
Expand Down