[PATCH] lib: Fix gencache_del

Michael Adam obnox at samba.org
Thu Mar 3 18:08:18 UTC 2016


On 2016-03-03 at 17:29 +0100, Michael Adam wrote:
> On 2016-03-03 at 16:57 +0100, Volker Lendecke wrote:
> > Hi!
> > 
> > Review appreciated!
> 
> great catch + fix.
> 
> pushed to autobuild

Unfortunately, this fails make test due to a slight
change in semantics of delete:

[220(726)/1892 at 21m20s] samba3.smbtorture_s3.LOCAL-GENCACHE
UNEXPECTED(failure): samba3.smbtorture_s3.LOCAL-GENCACHE.smbtorture(none)
REASON: Exception: Exception: using seed 1457024734
host=foo share=bar user= myname=localshare4
Running LOCAL-GENCACHE
../source3/torture/torture.c:8246: second gencache_del() succeeded
TEST LOCAL-GENCACHE FAILED!

Should we squash the attached patch with yours?
(to stay bisect-able)

Cheers - Michael
-------------- next part --------------
From 4f06a0ce0083797226b1a495bb5876345323e3d1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 3 Mar 2016 19:00:35 +0100
Subject: [PATCH] SQ: fix test to match new gencache_del behaviour

---
 source3/torture/torture.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 1df2ba0..e206d3f 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -8241,8 +8241,8 @@ static bool run_local_gencache(int dummy)
 		d_printf("%s: gencache_del() failed\n", __location__);
 		return False;
 	}
-	if (gencache_del("foo")) {
-		d_printf("%s: second gencache_del() succeeded\n",
+	if (!gencache_del("foo")) {
+		d_printf("%s: second gencache_del() failed\n",
 			 __location__);
 		return False;
 	}
@@ -8279,8 +8279,8 @@ static bool run_local_gencache(int dummy)
 		d_printf("%s: gencache_del() failed\n", __location__);
 		return False;
 	}
-	if (gencache_del("foo")) {
-		d_printf("%s: second gencache_del() succeeded\n",
+	if (!gencache_del("foo")) {
+		d_printf("%s: second gencache_del() failed\n",
 			 __location__);
 		return False;
 	}
-- 
2.5.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160303/defb1274/signature.sig>


More information about the samba-technical mailing list