s4:torture report connection error via torture_fail

[samba.git] / source4 / torture / smb2 / smb2.c

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 9418650de452c05854798db90cf464a2e03fa44b..a396a2eda2c9502586297a06e1fee115b51bec39 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"
@@ -31,17 +30,28 @@ static bool wrap_simple_1smb2_test(struct torture_context *torture_ctx,
 {
        bool (*fn) (struct torture_context *, struct smb2_tree *);
        bool ret;
-
        struct smb2_tree *tree1;
+       TALLOC_CTX *mem_ctx = talloc_new(torture_ctx);
 
-       if (!torture_smb2_connection(torture_ctx, &tree1))
+       if (!torture_smb2_connection(torture_ctx, &tree1)) {
+               torture_fail(torture_ctx,
+                           "Establishing SMB2 connection failed\n");
                return false;
+       }
+
+       /*
+        * This is a trick:
+        * The test might close the connection. If we steal the tree context
+        * before that and free the parent instead of tree directly, we avoid
+        * a double free error.
+        */
+       talloc_steal(mem_ctx, tree1);
 
        fn = test->fn;
 
        ret = fn(torture_ctx, tree1);
 
-       talloc_free(tree1);
+       talloc_free(mem_ctx);
 
        return ret;
 }
@@ -75,36 +85,45 @@ static bool wrap_simple_2smb2_test(struct torture_context *torture_ctx,
                                   struct torture_test *test)
 {
        bool (*fn) (struct torture_context *, struct smb2_tree *, struct smb2_tree *);
-       bool ret;
+       bool ret = false;
 
        struct smb2_tree *tree1;
        struct smb2_tree *tree2;
        TALLOC_CTX *mem_ctx = talloc_new(torture_ctx);
 
-       if (!torture_smb2_connection(torture_ctx, &tree1) ||
-           !torture_smb2_connection(torture_ctx, &tree2)) {
-               return false;
+       if (!torture_smb2_connection(torture_ctx, &tree1)) {
+               torture_fail(torture_ctx,
+                   "Establishing SMB2 connection failed\n");
+               goto done;
        }
 
        talloc_steal(mem_ctx, tree1);
+
+       if (!torture_smb2_connection(torture_ctx, &tree2)) {
+               torture_fail(torture_ctx,
+                   "Establishing SMB2 connection failed\n");
+               goto done;
+       }
+
        talloc_steal(mem_ctx, tree2);
 
        fn = test->fn;
 
        ret = fn(torture_ctx, tree1, tree2);
 
-       /* the test may already closed some of the connections */
+done:
+       /* the test may already have closed some of the connections */
        talloc_free(mem_ctx);
 
        return ret;
 }
 
 
-_PUBLIC_ struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
-                                                          const char *name,
-                                                          bool (*run)(struct torture_context *,
-                                                                      struct smb2_tree *,
-                                                                      struct smb2_tree *))
+struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
+                                                 const char *name,
+                                                 bool (*run)(struct torture_context *,
+                                                             struct smb2_tree *,
+                                                             struct smb2_tree *))
 {
        struct torture_test *test;
        struct torture_tcase *tcase;
@@ -126,21 +145,28 @@ _PUBLIC_ struct torture_test *torture_suite_add_2smb2_test(struct torture_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_suite(suite, torture_smb2_scan_init());
+       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_2smb2_test(suite, "PERSISTENT-HANDLES1", torture_smb2_persistent_handles1);
-       torture_suite_add_1smb2_test(suite, "OPLOCK-BATCH1", torture_smb2_oplock_batch1);
+       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_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_1smb2_test(suite, "bench-oplock", test_smb2_bench_oplock);
+       torture_suite_add_1smb2_test(suite, "hold-oplock", test_smb2_hold_oplock);
+       torture_suite_add_suite(suite, torture_smb2_session_init());
 
        suite->description = talloc_strdup(suite, "SMB2-specific tests");