From f5d8f58300116fd537e8ae15f319fd99529b212e Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Mon, 5 Dec 2016 11:21:15 +0100 Subject: s4/torture: vfs_fruit: test deleting a file with resource fork All the other tests ignore the return value of smb2_util_unlink(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=12427 Signed-off-by: Ralph Boehme Reviewed-by: Uri Simchoni (cherry picked from commit f555c2318eb06d1ceef32423dba9cd1a7c76f956) --- source4/torture/vfs/fruit.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c index e5ef898ea81..de61e1145f2 100644 --- a/source4/torture/vfs/fruit.c +++ b/source4/torture/vfs/fruit.c @@ -3611,6 +3611,38 @@ done: return ret; } +static bool test_delete_file_with_rfork(struct torture_context *tctx, + struct smb2_tree *tree) +{ + const char *fname = "torture_write_rfork_io"; + const char *rfork_content = "1234567890"; + NTSTATUS status; + bool ret = true; + + smb2_util_unlink(tree, fname); + + torture_comment(tctx, "Test deleting file with resource fork\n"); + + ret = torture_setup_file(tctx, tree, fname, false); + torture_assert_goto(tctx, ret == true, ret, done, "torture_setup_file failed\n"); + + ret = write_stream(tree, __location__, tctx, tctx, + fname, AFPRESOURCE_STREAM_NAME, + 10, 10, rfork_content); + torture_assert_goto(tctx, ret == true, ret, done, "write_stream failed\n"); + + ret = check_stream(tree, __location__, tctx, tctx, + fname, AFPRESOURCE_STREAM_NAME, + 0, 20, 10, 10, rfork_content); + torture_assert_goto(tctx, ret == true, ret, done, "check_stream failed\n"); + + status = smb2_util_unlink(tree, fname); + torture_assert_ntstatus_ok_goto(tctx, status, ret, done, "check_stream failed\n"); + +done: + return ret; +} + /* * Note: This test depends on "vfs objects = catia fruit streams_xattr". For * some tests torture must be run on the host it tests and takes an additional @@ -3644,6 +3676,7 @@ struct torture_suite *torture_vfs_fruit(void) torture_suite_add_1smb2_test(suite, "setinfo delete-on-close AFP_AfpResource", test_setinfo_delete_on_close_resource); torture_suite_add_1smb2_test(suite, "setinfo eof AFP_AfpResource", test_setinfo_eof_resource); torture_suite_add_1smb2_test(suite, "null afpinfo", test_null_afpinfo); + torture_suite_add_1smb2_test(suite, "delete", test_delete_file_with_rfork); return suite; } -- cgit v1.2.1