From: Ralph Boehme <slow@samba.org>
Date: Mon, 22 Oct 2018 12:01:34 +0000 (+0200)
Subject: s4:torture/vfs/fruit: enable AAPL extensions in a bunch of tests
X-Git-Tag: samba-4.8.8~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd53ad87f87555d571bf75a8b3a969acf4618fe3;p=thirdparty%2Fsamba.git

s4:torture/vfs/fruit: enable AAPL extensions in a bunch of tests

These tests check for macOS SMB server specific behaviour. They work
currently against Samba without enabling AAPL because in vfs_fruit we're
currently don't check whether AAPL has been negotiated in one place. A
subsequent commit will change that and this commit prepares for that
change.

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

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

diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index 5da7d11a9d4..669b7a66ac1 100644
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -1810,6 +1810,9 @@ static bool test_rfork_truncate(struct torture_context *tctx,
 	struct smb2_handle fh1, fh2, fh3;
 	union smb_setfileinfo sinfo;
 
+	ret = enable_aapl(tctx, tree);
+	torture_assert_goto(tctx, ret == true, ret, done, "enable_aapl failed");
+
 	smb2_util_unlink(tree, fname);
 
 	status = torture_smb2_testdir(tree, BASEDIR, &testdirh);
@@ -1928,6 +1931,9 @@ static bool test_rfork_create(struct torture_context *tctx,
 	};
 	union smb_fileinfo finfo;
 
+	ret = enable_aapl(tctx, tree);
+	torture_assert_goto(tctx, ret == true, ret, done, "enable_aapl failed");
+
 	smb2_util_unlink(tree, fname);
 
 	status = torture_smb2_testdir(tree, BASEDIR, &testdirh);
@@ -3935,6 +3941,9 @@ static bool test_setinfo_eof_resource(struct torture_context *tctx,
 
 	torture_assert_goto(tctx, mem_ctx != NULL, ret, done, "talloc_new");
 
+	ret = enable_aapl(tctx, tree);
+	torture_assert_goto(tctx, ret == true, ret, done, "enable_aapl failed");
+
 	torture_comment(tctx, "Set AFP_AfpResource EOF to 1 and 0\n");
 
 	smb2_deltree(tree, BASEDIR);
@@ -4901,6 +4910,9 @@ static bool test_setinfo_stream_eof(struct torture_context *tctx,
 	torture_assert_goto(tctx, mem_ctx != NULL, ret, done,
 			    "talloc_new failed\n");
 
+	ret = enable_aapl(tctx, tree);
+	torture_assert(tctx, ret == true, "enable_aapl failed");
+
 	torture_comment(tctx, "Test setting EOF on a stream\n");
 
 	smb2_deltree(tree, BASEDIR);