s4-torture: Make notify a suite

diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 402974cb66b4297ceca47c5d119aa5905f047dda..cac4b46e07aeedfc95163198eccc44f65b8dbdfa 100644 (file)
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -1694,9 +1694,9 @@ static bool test_notify_alignment(struct smbcli_state *cli,
 /*
    basic testing of change notify
 */
-bool torture_raw_notify(struct torture_context *torture, 
-                       struct smbcli_state *cli, 
-                       struct smbcli_state *cli2)
+static bool test_raw_notify_all(struct torture_context *torture,
+                               struct smbcli_state *cli,
+                               struct smbcli_state *cli2)
 {
        bool ret = true;
 
@@ -1724,3 +1724,12 @@ bool torture_raw_notify(struct torture_context *torture,
        smbcli_deltree(cli->tree, BASEDIR);
        return ret;
 }
+
+struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
+{
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "notify");
+
+       torture_suite_add_2smb_test(suite, "all", test_raw_notify_all);
+
+       return suite;
+}

diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c
index 88cb1c59a493a40c0f3aa8ab734d01035bad243d..39698dc15ea73a24584240c6955d4e069e9565a0 100644 (file)
--- a/source4/torture/raw/raw.c
+++ b/source4/torture/raw/raw.c
@@ -47,7 +47,7 @@ NTSTATUS torture_raw_init(void)
        torture_suite_add_1smb_test(suite, "mkdir", torture_raw_mkdir);
        torture_suite_add_suite(suite, torture_raw_oplock(suite));
        torture_suite_add_1smb_test(suite, "hold-oplock", torture_hold_oplock);
-       torture_suite_add_2smb_test(suite, "notify", torture_raw_notify);
+       torture_suite_add_suite(suite, torture_raw_notify(suite));
        torture_suite_add_1smb_test(suite, "mux", torture_raw_mux);
        torture_suite_add_1smb_test(suite, "ioctl", torture_raw_ioctl);
        torture_suite_add_1smb_test(suite, "chkpath", torture_raw_chkpath);