s4-torture: add smb2 ioctl test suite

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

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 3c9522e771b31d1cecb5d5cbf795309ea3dc34d2..de8d400ff8b36b70805b4a98719619a7cdc06586 100644 (file)
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
-#include "libcli/smb2/smb2_calls.h"
 
 #include "torture/smbtorture.h"
 #include "torture/smb2/proto.h"
@@ -126,21 +125,28 @@ struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
 
 NTSTATUS torture_smb2_init(void)
 {
-       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "SMB2");
-       torture_suite_add_simple_test(suite, "CONNECT", torture_smb2_connect);
-       torture_suite_add_simple_test(suite, "SCAN", torture_smb2_scan);
-       torture_suite_add_simple_test(suite, "SCANGETINFO", torture_smb2_getinfo_scan);
-       torture_suite_add_simple_test(suite, "SCANSETINFO", torture_smb2_setinfo_scan);
-       torture_suite_add_simple_test(suite, "SCANFIND", torture_smb2_find_scan);
-       torture_suite_add_simple_test(suite, "GETINFO", torture_smb2_getinfo);
-       torture_suite_add_simple_test(suite, "SETINFO", torture_smb2_setinfo);
-       torture_suite_add_simple_test(suite, "FIND", torture_smb2_find);
+       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "smb2");
+       torture_suite_add_simple_test(suite, "connect", torture_smb2_connect);
+       torture_suite_add_simple_test(suite, "scan", torture_smb2_scan);
+       torture_suite_add_simple_test(suite, "scangetinfo", torture_smb2_getinfo_scan);
+       torture_suite_add_simple_test(suite, "scansetinfo", torture_smb2_setinfo_scan);
+       torture_suite_add_simple_test(suite, "scanfind", torture_smb2_find_scan);
+       torture_suite_add_simple_test(suite, "getinfo", torture_smb2_getinfo);
+       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_simple_test(suite, "NOTIFY", torture_smb2_notify);
+       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_1smb2_test(suite, "OPLOCK-BATCH1", torture_smb2_oplock_batch1);
+       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_1smb2_test(suite, "bench-oplock", test_smb2_bench_oplock);
+       torture_suite_add_1smb2_test(suite, "hold-oplock", test_smb2_hold_oplock);
 
        suite->description = talloc_strdup(suite, "SMB2-specific tests");