s4/torture: use torture_assert_goto in a vfs.fruit test

No change in behavior.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13155

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 9af9c5c073d88b126aebd4a2d7a1a1971527fbf4)

diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index c5ee7af3bc19200c2146fc63f9af629c15e1cb35..16b64772296089cd57b5050d026b4ba6bfed08ef 100644 (file)
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -2032,14 +2032,17 @@ static bool test_adouble_conversion(struct torture_context *tctx,
        torture_comment(tctx, "(%s) test OS X AppleDouble conversion\n",
            __location__);
 
-       ret &= check_stream(tree, __location__, tctx, mem_ctx,
-                           fname, AFPRESOURCE_STREAM,
-                           16, datalen, 0, datalen, data);
+       ret = check_stream(tree, __location__, tctx, mem_ctx,
+                          fname, AFPRESOURCE_STREAM,
+                          16, datalen, 0, datalen, data);
+       torture_assert_goto(tctx, ret == true, ret, done,
+                           "check AFPRESOURCE_STREAM failed\n");
 
-       ret &= check_stream(tree, __location__, tctx, mem_ctx,
-                           fname,
-                           ":foo" "\xef\x80\xa2" "bar:$DATA", /* "foo:bar:$DATA" */
-                           0, 3, 0, 3, "baz");
+       ret = check_stream(tree, __location__, tctx, mem_ctx, fname,
+                          ":foo" "\xef\x80\xa2" "bar:$DATA", /* "foo:bar:$DATA" */
+                          0, 3, 0, 3, "baz");
+       torture_assert_goto(tctx, ret == true, ret, done,
+                           "check foo:bar stream failed\n");
 
 done:
        smb2_deltree(tree, BASEDIR);