s4:torture: use torture_assert instead of torture_comment and return in defer_open...

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 66c6d41fe0e169aebc486ec5ece2893910511f87..1d04b358396c268d9b1a40367e0dcbbc5cad296e 100644 (file)
--- 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);