1
diff --git a/debian/changelog b/debian/changelog
2
index 0775bd3..3a00fed 100644
3
--- a/debian/changelog
4
+++ b/debian/changelog
5
@@ -1,3 +1,10 @@
6
1
memcached (1.5.21-1ubuntu1) focal; urgency=medium
7
2
8
3
  * d/p/stats_prefix-Remove-test-failure-due-to-non-determin.patch: fix FTFBS
9
4
    on s390x (LP: #1861783)
10
5
11
6
 -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Tue, 04 Feb 2020 10:02:44 +0100
12
7
13
1
memcached (1.5.21-1) unstable; urgency=medium
8
memcached (1.5.21-1) unstable; urgency=medium
14
2
9
15
3
  * New upstream release.
10
  * New upstream release.
16
diff --git a/debian/control b/debian/control
17
index c2b1691..caf9830 100644
18
--- a/debian/control
19
+++ b/debian/control
20
@@ -1,7 +1,8 @@
21
1
Source: memcached
1
Source: memcached
22
2
Section: web
2
Section: web
23
3
Priority: optional
3
Priority: optional
25
4
Maintainer: Chris Lamb <lamby@debian.org>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26
5
XSBC-Original-Maintainer: Chris Lamb <lamby@debian.org>
27
5
Build-Depends:
6
Build-Depends:
28
6
 adduser,
7
 adduser,
29
7
 debhelper-compat (= 12),
8
 debhelper-compat (= 12),
30
diff --git a/debian/patches/series b/debian/patches/series
31
index 5f3753c..dd01f20 100644
32
--- a/debian/patches/series
33
+++ b/debian/patches/series
34
@@ -3,3 +3,4 @@
35
3
0003-Uses-retry-to-wait-up-to-5-seconds-for-the-killed-pr.patch
3
0003-Uses-retry-to-wait-up-to-5-seconds-for-the-killed-pr.patch
36
4
0004-Don-t-run-some-upstream-tests.patch
4
0004-Don-t-run-some-upstream-tests.patch
37
5
0005-Source-etc-default-memcached-in-etc-init.d-memcached.patch
5
0005-Source-etc-default-memcached-in-etc-init.d-memcached.patch
38
6
stats_prefix-Remove-test-failure-due-to-non-determin.patch
39
diff --git a/debian/patches/stats_prefix-Remove-test-failure-due-to-non-determin.patch b/debian/patches/stats_prefix-Remove-test-failure-due-to-non-determin.patch
40
6
new file mode 100644
7
new file mode 100644
41
index 0000000..5792fb0
42
--- /dev/null
43
+++ b/debian/patches/stats_prefix-Remove-test-failure-due-to-non-determin.patch
44
@@ -0,0 +1,67 @@
45
1
From 0ffde456cb21a7a03ee263f026edd565bb0f2123 Mon Sep 17 00:00:00 2001
46
2
From: Kanak Kshetri <kanakkshetri@fastmail.fm>
47
3
Date: Fri, 31 Jan 2020 07:33:15 -0600
48
4
Subject: [PATCH] stats_prefix: Remove test failure due to non-determinism
49
5
50
6
If you have multiple keys, the order in which they are dumped is
51
7
non-deterministic because it is iterating over a hash table used by
52
8
prefix stats.
53
9
54
10
Fix the assertions by searching for expected lines in output instead
55
11
of checking that the strings are exactly the same.
56
12
57
13
Origin: upstream, https://github.com/memcached/memcached/commit/0ffde456cb21a7a03ee263f026edd565bb0f2123
58
14
Last-Update: 2020-02-04
59
15
60
16
---
61
17
 testapp.c | 26 +++++++++++++-------------
62
18
 1 file changed, 13 insertions(+), 13 deletions(-)
63
19
64
20
diff --git a/testapp.c b/testapp.c
65
21
index b670708e..9819172e 100644
66
22
--- a/testapp.c
67
23
+++ b/testapp.c
68
24
@@ -347,13 +347,13 @@ static enum test_return test_stats_prefix_dump(void) {
69
25
     assert(strcmp(expected, stats_prefix_dump(&length)) == 0);
70
26
     assert(strlen(expected) == length);
71
27
 
72
28
-    /* The order of results might change if we switch hash functions. */
73
29
     stats_prefix_record_delete("def:123", 7);
74
30
-    expected = "PREFIX abc get 2 hit 1 set 1 del 1\r\n"
75
31
-               "PREFIX def get 0 hit 0 set 0 del 1\r\n"
76
32
-               "END\r\n";
77
33
-    assert(strcmp(expected, stats_prefix_dump(&length)) == 0);
78
34
-    assert(strlen(expected) == length);
79
35
+    /* NOTE: The prefixes can be dumped in any order, so verification
80
36
+       does not just check that the strings are exactly the same as before. */
81
37
+    const char *actual = stats_prefix_dump(&length);
82
38
+    assert(strstr(actual, "PREFIX abc get 2 hit 1 set 1 del 1\r\n") != NULL);
83
39
+    assert(strstr(actual, "PREFIX def get 0 hit 0 set 0 del 1\r\n") != NULL);
84
40
+    assert(strstr(actual, "END\r\n") != NULL);
85
41
 
86
42
     /* Find a key that hashes to the same bucket as "abc" */
87
43
     bool found_match = false;
88
44
@@ -367,13 +367,13 @@ static enum test_return test_stats_prefix_dump(void) {
89
45
     }
90
46
     assert(found_match);
91
47
     stats_prefix_record_set(tmp, strlen(tmp));
92
48
-    snprintf(tmp, sizeof(tmp),
93
49
-             "PREFIX %d get 0 hit 0 set 1 del 0\r\n"
94
50
-             "PREFIX abc get 2 hit 1 set 1 del 1\r\n"
95
51
-             "PREFIX def get 0 hit 0 set 0 del 1\r\n"
96
52
-             "END\r\n", keynum);
97
53
-    assert(strcmp(tmp, stats_prefix_dump(&length)) == 0);
98
54
-    assert(strlen(tmp) == length);
99
55
+
100
56
+    actual = stats_prefix_dump(&length);
101
57
+    assert(strstr(actual, "PREFIX abc get 2 hit 1 set 1 del 1\r\n") != NULL);
102
58
+    assert(strstr(actual, "PREFIX def get 0 hit 0 set 0 del 1\r\n") != NULL);
103
59
+    assert(strstr(actual, "END\r\n") != NULL);
104
60
+    snprintf(tmp, sizeof(tmp), "PREFIX %d get 0 hit 0 set 1 del 0\r\n", keynum);
105
61
+    assert(strstr(actual, tmp) != NULL);
106
62
 
107
63
     return TEST_PASS;
108
64
 }
109
65
-- 
110
66
2.25.0
111
67
Reviewer	Date Requested	Status
Bryce Harrington (community)	2020-02-04	Approve on 2020-02-05
Canonical Server	2020-02-04	Pending
Canonical Server packageset reviewers	2020-02-04	Pending
Review via email: mp+378510@code.launchpad.net