s4-torture: Separate out the notify tdis subtest

diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index b03285aa13f31936ddc21e2e0258d546be4417b2..02a211d4d8d30a5f7baef9455585cc5b08d5552b 100644 (file)
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -877,7 +877,8 @@ done:
 /*
   basic testing of change notifies followed by a tdis
 */
-static bool test_notify_tdis(struct torture_context *tctx)
+static bool test_notify_tdis(struct torture_context *tctx,
+                            struct smbcli_state *cli1)
 {
        bool ret = true;
        NTSTATUS status;
@@ -889,6 +890,10 @@ static bool test_notify_tdis(struct torture_context *tctx)
 
        printf("TESTING CHANGE NOTIFY FOLLOWED BY TDIS\n");
 
+       if (!torture_setup_dir(cli1, BASEDIR)) {
+               return false;
+       }
+
        if (!torture_open_connection(&cli, tctx, 0)) {
                return false;
        }
@@ -933,6 +938,7 @@ static bool test_notify_tdis(struct torture_context *tctx)
 
 done:
        torture_close_connection(cli);
+       smbcli_deltree(cli1->tree, BASEDIR);
        return ret;
 }
 
@@ -1740,7 +1746,6 @@ static bool test_raw_notify_all(struct torture_context *torture,
                return false;
        }
 
-       ret &= test_notify_tdis(torture);
        ret &= test_notify_exit(torture);
        ret &= test_notify_ulogoff(torture);
        ret &= test_notify_tcp_dis(torture);
@@ -1766,6 +1771,7 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
        torture_suite_add_1smb_test(suite, "mask_change",
                                    test_notify_mask_change);
        torture_suite_add_1smb_test(suite, "file", test_notify_file);
+       torture_suite_add_1smb_test(suite, "tdis", test_notify_tdis);
        torture_suite_add_2smb_test(suite, "all", test_raw_notify_all);
 
        return suite;