From 2de68b77f681a05effbe8564cd4cbe92815bb51b Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Tue, 2 Jul 2024 12:28:00 -0500 Subject: [PATCH] enable tests, selectively disable others --- valkey.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/valkey.spec b/valkey.spec index f700131..abd7d99 100644 --- a/valkey.spec +++ b/valkey.spec @@ -1,9 +1,9 @@ # Tests fail in mock, not in local build. -%bcond_with tests +%bcond_without tests Name: valkey Version: 7.2.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause # hiredis: BSD-3-Clause @@ -98,6 +98,7 @@ Provides: redis = %{version}-%{release} %endif BuildArch: noarch + %description compat-redis %summary @@ -198,8 +199,10 @@ install -Dpm 755 %{S:9} %{buildroot}%{_libexecdir}/migrate_redis_to_valkey.sh %check %if %{with tests} # https://github.com/redis/redis/issues/1417 (for "taskset -c 1") -taskset -c 1 make %{make_flags} test -make %{make_flags} test-sentinel +taskset -c 1 ./runtest --skiptest "Active defrag - AOF loading" + +# sentinel tests fail in mock, but we want the normal tests above +#./runtest-sentinel %endif %pre @@ -305,6 +308,11 @@ fi %changelog +* Tue Jul 02 2024 Jonathan Wright - 7.2.5-8 +- Enable tests by default + selectively disable tests that fail in mock for redis + disable redis-sentinel tests, they always fail in mock + * Sat Jun 22 2024 Neal Gompa - 7.2.5-7 - Enable automatic replacement of redis with valkey