diff --git a/debian/patches/disable-buildd-failed-test.patch b/debian/patches/disable-buildd-failed-test.patch deleted file mode 100644 index 429035a3cd0a252e9ae3e2d727447796a2f50e46..0000000000000000000000000000000000000000 --- a/debian/patches/disable-buildd-failed-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -This test is failing on buildd only -Last-Update: 2020-09-27 - ---- a/test/cluster/client_options_test.rb -+++ b/test/cluster/client_options_test.rb -@@ -82,7 +82,7 @@ - build_another_client(invalid_option: true) - end - -- def test_client_works_even_if_so_many_unavailable_nodes_specified -+ def _test_client_works_even_if_so_many_unavailable_nodes_specified - min = 7000 - max = min + Process.getrlimit(Process::RLIMIT_NOFILE).first / 3 * 2 - nodes = (min..max).map { |port| "redis://127.0.0.1:#{port}" } diff --git a/debian/patches/disable-encoding-check.patch b/debian/patches/disable-encoding-check.patch index f065559e01f3a049ab83e30375a6c7a164cacd95..2b2a3bcbbbba14e87e62dc0694ca9f10f2f5b896 100644 --- a/debian/patches/disable-encoding-check.patch +++ b/debian/patches/disable-encoding-check.patch @@ -6,12 +6,11 @@ Last-Update: 2020-09-27 --- a/test/distributed/commands_requiring_clustering_test.rb +++ b/test/distributed/commands_requiring_clustering_test.rb -@@ -170,7 +170,7 @@ - r.bitop(:xor, "{qux}foo^bar", "{qux}foo", "{qux}bar") - assert_equal "\x03", r.get("{qux}foo^bar") - r.bitop(:not, "{qux}~foo", "{qux}foo") -- assert_equal "\x9E", r.get("{qux}~foo") -+ #assert_equal "\x9E", r.get("{qux}~foo") - end +@@ -169,6 +169,6 @@ + r.bitop(:xor, "{qux}foo^bar", "{qux}foo", "{qux}bar") + assert_equal "\x03", r.get("{qux}foo^bar") + r.bitop(:not, "{qux}~foo", "{qux}foo") +- assert_equal "\x9E".b, r.get("{qux}~foo") ++ #assert_equal "\x9E".b, r.get("{qux}~foo") end end diff --git a/debian/patches/disable-ssl-test.patch b/debian/patches/disable-ssl-test.patch index 94744fd0c0cfe44fa1c47bfd63636934a86ce988..92a6353763213fb37d9981d55e1deff81ced35d0 100644 --- a/debian/patches/disable-ssl-test.patch +++ b/debian/patches/disable-ssl-test.patch @@ -8,7 +8,7 @@ Last-Update: 2020-09-27 --- a/Rakefile +++ b/Rakefile -@@ -9,7 +9,7 @@ +@@ -11,7 +11,7 @@ Rake::TestTask.new(group) do |t| t.libs << "test" t.libs << "lib" diff --git a/debian/patches/series b/debian/patches/series index eaf1ecef4e818c98d701e0ad33eddbb7bb056d97..f6c65f6424d375a53182ce0aded8461cba453ad5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ use-system-redis.patch disable-encoding-check.patch disable-ssl-test.patch -use-system-libs.patch -disable-buildd-failed-test.patch diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch deleted file mode 100644 index 0c263313aa9db3ee5cb452696527fb749364605a..0000000000000000000000000000000000000000 --- a/debian/patches/use-system-libs.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Use system libs in tests - Use the libs which are in $LOAD_PATH instead of using the relative paths. -Author: Jongmin Kim <jmkim@pukyong.ac.kr> -Forwarded: not-needed -Last-Update: 2020-09-27 ---- a/test/redis/synchrony_driver.rb -+++ b/test/redis/synchrony_driver.rb -@@ -3,8 +3,8 @@ - require "em-synchrony" - require "em-synchrony/connection_pool" - --require_relative "../lib/redis" --require_relative "../lib/redis/connection/synchrony" -+require_relative "redis" -+require_relative "redis/connection/synchrony" - - require "helper" - diff --git a/debian/patches/use-system-redis.patch b/debian/patches/use-system-redis.patch index 46e6025940aed612386310729684176f359652ec..af52ab46c4bfd60c246e394dbf6e1e6c5b9bd496 100644 --- a/debian/patches/use-system-redis.patch +++ b/debian/patches/use-system-redis.patch @@ -10,7 +10,7 @@ Last-Update: 2020-09-27 --- a/makefile +++ b/makefile @@ -1,18 +1,16 @@ --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