From 762b0d3bf3cf7cc444e3dcee794e33812f5d2753 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 4 Jul 2024 00:28:21 +0530
Subject: [PATCH] Refresh patches (remove patches no longer needed)
---
.../patches/disable-buildd-failed-test.patch | 14 --------------
debian/patches/disable-encoding-check.patch | 13 ++++++-------
debian/patches/disable-ssl-test.patch | 2 +-
debian/patches/series | 2 --
debian/patches/use-system-libs.patch | 18 ------------------
debian/patches/use-system-redis.patch | 2 +-
6 files changed, 8 insertions(+), 43 deletions(-)
delete mode 100644 debian/patches/disable-buildd-failed-test.patch
delete mode 100644 debian/patches/use-system-libs.patch
diff --git a/debian/patches/disable-buildd-failed-test.patch b/debian/patches/disable-buildd-failed-test.patch
deleted file mode 100644
index 429035a..0000000
--- 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 f065559..2b2a3bc 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 94744fd..92a6353 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 eaf1ece..f6c65f6 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 0c26331..0000000
--- 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 46e6025..af52ab4 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
--
GitLab