s4/torture: use torture_assert_goto in a vfs.fruit test
authorRalph Boehme <slow@samba.org>
Fri, 17 Nov 2017 11:41:49 +0000 (12:41 +0100)
committerJeremy Allison <jra@samba.org>
Wed, 29 Nov 2017 03:35:24 +0000 (04:35 +0100)
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>
source4/torture/vfs/fruit.c

index 6f61d4db55f0bfbfe64c2ef527099738f13fee29..f5b4f654f7b1ebfd75b4064fe5bbbb2f2425a9fa 100644 (file)
@@ -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);