From 6f6192b9980c11c7fed98c2f038fd2803a6ab92b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 18 Apr 2012 12:27:38 +0200 Subject: s4-torture: Separate out the notify mask_change subtest --- source4/torture/raw/notify.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'source4/torture/raw/notify.c') diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index b01c7c826d..e87452da00 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -446,7 +446,8 @@ done: /* testing of change notify mask change */ -static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) +static bool test_notify_mask_change(struct torture_context *mem_ctx, + struct smbcli_state *cli) { bool ret = true; NTSTATUS status; @@ -457,6 +458,10 @@ static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ct printf("TESTING CHANGE NOTIFY WITH MASK CHANGE\n"); + if (!torture_setup_dir(cli, BASEDIR)) { + return false; + } + /* get a handle on the directory */ @@ -557,6 +562,7 @@ static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ct done: smb_raw_exit(cli->session); + smbcli_deltree(cli->tree, BASEDIR); return ret; } @@ -1728,7 +1734,6 @@ static bool test_raw_notify_all(struct torture_context *torture, return false; } - ret &= test_notify_mask_change(cli, torture); ret &= test_notify_file(cli, torture); ret &= test_notify_tdis(torture); ret &= test_notify_exit(torture); @@ -1753,6 +1758,8 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx) torture_suite_add_2smb_test(suite, "dir", test_notify_dir); torture_suite_add_1smb_test(suite, "mask", test_notify_mask); torture_suite_add_1smb_test(suite, "recursive", test_notify_recursive); + torture_suite_add_1smb_test(suite, "mask_change", + test_notify_mask_change); torture_suite_add_2smb_test(suite, "all", test_raw_notify_all); return suite; -- cgit