From a6e098fb221eb581b99e9b31f221462ee6b7b1cb Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 25 Jul 2014 00:24:56 +0200 Subject: [PATCH] s4:torture: use torture_assert instead of torture_comment and return in defer_open test Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- source4/torture/basic/base.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 66c6d41fe0e..1d04b358396 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -686,10 +686,11 @@ static bool run_deferopen(struct torture_context *tctx, struct smbcli_state *cli } } while (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),NT_STATUS_SHARING_VIOLATION)); - if (fnum == -1) { - torture_comment(tctx,"Failed to open %s, error=%s\n", fname, smbcli_errstr(cli->tree)); - return false; - } + torture_assert(tctx, fnum != -1, + talloc_asprintf(tctx, + "pid %u: Failed to open %s, error=%s\n", + (unsigned)getpid(), fname, + smbcli_errstr(cli->tree))); torture_comment(tctx, "pid %u: open %d\n", (unsigned)getpid(), i); -- 2.11.4.GIT