s4-torture: Separate out the notify mask_change subtest

diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index b01c7c826ddde802a380a0d4a697caceaca72137..e87452da00efe0d79b9cc584d62b2ec558c606cb 100644 (file)
--- 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;