Accepting request 639766 from network:utilities

OBS-URL: https://build.opensuse.org/request/show/639766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/memcached?expand=0&rev=41
This commit is contained in:
Dominique Leuenberger 2018-10-09 13:52:22 +00:00 committed by Git OBS Bridge
commit 80a6a0ca86
3 changed files with 41 additions and 1 deletions

32
memcached-fix_test.patch Normal file
View File

@ -0,0 +1,32 @@
From b2b574ae46454d7016012bf8b40a2d24cd723e60 Mon Sep 17 00:00:00 2001
From: dormando <dormando@rydia.net>
Date: Fri, 10 Aug 2018 15:31:22 -0700
Subject: [PATCH] t/lru-maintainer.t: check for WARM item earlier
item might get pushed back out as we keep doing work.
---
t/lru-maintainer.t | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/lru-maintainer.t b/t/lru-maintainer.t
index 04fa76ac6..adacd1b48 100644
--- a/t/lru-maintainer.t
+++ b/t/lru-maintainer.t
@@ -68,6 +68,8 @@ for (my $key = 0; $key < 100; $key++) {
}
last;
}
+ my $istats = mem_stats($sock, "items");
+ isnt($istats->{"items:31:number_warm"}, 0, "our canary moved to warm");
}
print $sock "set key$key 0 0 66560\r\n$value\r\n";
is(scalar <$sock>, "STORED\r\n", "stored key$key");
@@ -76,8 +78,6 @@ for (my $key = 0; $key < 100; $key++) {
{
my $stats = mem_stats($sock);
isnt($stats->{evictions}, 0, "some evictions happened");
- my $istats = mem_stats($sock, "items");
- isnt($istats->{"items:31:number_warm"}, 0, "our canary moved to warm");
use Data::Dumper qw/Dumper/;
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 3 11:52:39 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add patch to fix aarch64, ppc64* and s390x tests:
* memcached-fix_test.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 17 15:15:38 UTC 2018 - nicolas.bock@suse.com Fri Aug 17 15:15:38 UTC 2018 - nicolas.bock@suse.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -35,6 +35,7 @@ Source4: memcached.service
Patch0: memcached-1.4.5.dif Patch0: memcached-1.4.5.dif
Patch1: memcached-autofoo.patch Patch1: memcached-autofoo.patch
Patch2: memcached-use-endian_h.patch Patch2: memcached-use-endian_h.patch
Patch3: memcached-fix_test.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-devel
@ -82,6 +83,7 @@ This package contains development files
%patch0 %patch0
%patch1 %patch1
%patch2 %patch2
%patch3 -p1
%build %build
autoreconf -fi autoreconf -fi