s4:torture/smb2/read: add test for cancelling SMB aio

[nivanova/samba-autobuild/.git] / source4 / torture / smb2 / smb2.c

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 19d7e4ae92a70c4bb566007c7965032ec872495a..6f9884e3c27ee49fbb9473d611296189e6c2df7c 100644 (file)
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -1,18 +1,18 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB torture tester
    Copyright (C) Jelmer Vernooij 2006
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -61,9 +61,9 @@ struct torture_test *torture_suite_add_1smb2_test(struct torture_suite *suite,
                                                  bool (*run)(struct torture_context *,
                                                              struct smb2_tree *))
 {
-       struct torture_test *test; 
+       struct torture_test *test;
        struct torture_tcase *tcase;
-       
+
        tcase = torture_suite_add_tcase(suite, name);
 
        test = talloc(tcase, struct torture_test);
@@ -74,7 +74,7 @@ struct torture_test *torture_suite_add_1smb2_test(struct torture_suite *suite,
        test->fn = run;
        test->dangerous = false;
 
-       DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+       DLIST_ADD_END(tcase->tests, test);
 
        return test;
 }
@@ -138,42 +138,61 @@ struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
        test->fn = run;
        test->dangerous = false;
 
-       DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+       DLIST_ADD_END(tcase->tests, test);
 
        return test;
 }
 
-NTSTATUS torture_smb2_init(void)
+NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
 {
-       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "smb2");
+       struct torture_suite *suite = torture_suite_create(ctx, "smb2");
        torture_suite_add_simple_test(suite, "connect", torture_smb2_connect);
-       torture_suite_add_suite(suite, torture_smb2_scan_init());
-       torture_suite_add_suite(suite, torture_smb2_getinfo_init());
+       torture_suite_add_suite(suite, torture_smb2_scan_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_getinfo_init(suite));
        torture_suite_add_simple_test(suite, "setinfo", torture_smb2_setinfo);
-       torture_suite_add_suite(suite, torture_smb2_lock_init());
-       torture_suite_add_suite(suite, torture_smb2_read_init());
-       torture_suite_add_suite(suite, torture_smb2_create_init());
-       torture_suite_add_suite(suite, torture_smb2_acls_init());
-       torture_suite_add_suite(suite, torture_smb2_notify_init());
-       torture_suite_add_suite(suite, torture_smb2_durable_open_init());
-       torture_suite_add_suite(suite, torture_smb2_durable_open_disconnect_init());
-       torture_suite_add_suite(suite, torture_smb2_durable_v2_open_init());
-       torture_suite_add_suite(suite, torture_smb2_dir_init());
-       torture_suite_add_suite(suite, torture_smb2_lease_init());
-       torture_suite_add_suite(suite, torture_smb2_compound_init());
-       torture_suite_add_suite(suite, torture_smb2_oplocks_init());
-       torture_suite_add_suite(suite, torture_smb2_streams_init());
-       torture_suite_add_suite(suite, torture_smb2_ioctl_init());
-       torture_suite_add_suite(suite, torture_smb2_rename_init());
+       torture_suite_add_suite(suite, torture_smb2_lock_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_read_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_aio_delay_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_create_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_acls_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_notify_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_notify_inotify_init(suite));
+       torture_suite_add_suite(suite,
+               torture_smb2_notify_disabled_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_durable_open_init(suite));
+       torture_suite_add_suite(suite,
+               torture_smb2_durable_open_disconnect_init(suite));
+       torture_suite_add_suite(suite,
+               torture_smb2_durable_v2_open_init(suite));
+       torture_suite_add_suite(suite,
+               torture_smb2_durable_v2_delay_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_dir_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_lease_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_compound_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_compound_find_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_oplocks_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_kernel_oplocks_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_streams_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_ioctl_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_rename_init(suite));
        torture_suite_add_1smb2_test(suite, "bench-oplock", test_smb2_bench_oplock);
+       torture_suite_add_suite(suite, torture_smb2_sharemode_init(suite));
        torture_suite_add_1smb2_test(suite, "hold-oplock", test_smb2_hold_oplock);
-       torture_suite_add_suite(suite, torture_smb2_session_init());
-
-       torture_suite_add_suite(suite, torture_smb2_doc_init());
+       torture_suite_add_suite(suite, torture_smb2_session_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_replay_init(suite));
+       torture_suite_add_simple_test(suite, "dosmode", torture_smb2_dosmode);
+       torture_suite_add_simple_test(suite, "maxfid", torture_smb2_maxfid);
+       torture_suite_add_simple_test(suite, "hold-sharemode",
+                                     torture_smb2_hold_sharemode);
+       torture_suite_add_simple_test(suite, "check-sharemode",
+                                     torture_smb2_check_sharemode);
+       torture_suite_add_suite(suite, torture_smb2_crediting_init(suite));
+
+       torture_suite_add_suite(suite, torture_smb2_doc_init(suite));
 
        suite->description = talloc_strdup(suite, "SMB2-specific tests");
 
-       torture_register_suite(suite);
+       torture_register_suite(ctx, suite);
 
        return NT_STATUS_OK;
 }