Changeset 740 for vendor/current/lib/torture/torture.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/torture/torture.c (modified) (17 diffs)

vendor/current/lib/torture/torture.c ¶

@@ -1 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB torture UI functions
 
    Copyright (C) Jelmer Vernooij 2006-2008
-   
+
    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/>.
@@ -24 +24 @@
 #include "param/param.h"
 #include "system/filesys.h"
+#include "system/dir.h"
+
 
 struct torture_results *torture_results_init(TALLOC_CTX *mem_ctx, const struct torture_ui_ops *ui_ops)
@@ -72 +74 @@
 
         return subtorture;
-}       
-
-/**
- create a temporary directory.
+}
+
+/**
+ create a temporary directory under the output dir
 */
-_PUBLIC_ NTSTATUS torture_temp_dir(struct torture_context *tctx, 
-                                   const char *prefix, 
-                                   char **tempdir)
+_PUBLIC_ NTSTATUS torture_temp_dir(struct torture_context *tctx,
+                                   const char *prefix, char **tempdir)
 {
         SMB_ASSERT(tctx->outputdir != NULL);
 
-        *tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir, 
+        *tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir,
                                    prefix);
         NT_STATUS_HAVE_NO_MEMORY(*tempdir);
@@ -91 +92 @@
         }
 
+        return NT_STATUS_OK;
+}
+
+static int local_deltree(const char *path)
+{
+        int ret = 0;
+        struct dirent *dirent;
+        DIR *dir = opendir(path);
+        if (!dir) {
+                char *error = talloc_asprintf(NULL, "Could not open directory %s", path);
+                perror(error);
+                talloc_free(error);
+                return -1;
+        }
+        while ((dirent = readdir(dir))) {
+                char *name;
+                if ((strcmp(dirent->d_name, ".") == 0) || (strcmp(dirent->d_name, "..") == 0)) {
+                        continue;
+                }
+                name = talloc_asprintf(NULL, "%s/%s", path,
+                                       dirent->d_name);
+                if (name == NULL) {
+                        closedir(dir);
+                        return -1;
+                }
+                DEBUG(0, ("About to remove %s\n", name));
+                ret = remove(name);
+                if (ret == 0) {
+                        talloc_free(name);
+                        continue;
+                }
+
+                if (errno == ENOTEMPTY) {
+                        ret = local_deltree(name);
+                        if (ret == 0) {
+                                ret = remove(name);
+                        }
+                }
+                talloc_free(name);
+                if (ret != 0) {
+                        char *error = talloc_asprintf(NULL, "Could not remove %s", path);
+                        perror(error);
+                        talloc_free(error);
+                        break;
+                }
+        }
+        closedir(dir);
+        rmdir(path);
+        return ret;
+}
+
+_PUBLIC_ NTSTATUS torture_deltree_outputdir(struct torture_context *tctx)
+{
+        if (tctx->outputdir == NULL) {
+                return NT_STATUS_OK;
+        }
+        if ((strcmp(tctx->outputdir, "/") == 0)
+            || (strcmp(tctx->outputdir, "") == 0)) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        if (local_deltree(tctx->outputdir) == -1) {
+                if (errno != 0) {
+                        return map_nt_error_from_unix(errno);
+                }
+                return NT_STATUS_UNSUCCESSFUL;
+        }
         return NT_STATUS_OK;
 }
@@ -108 +176 @@
         tmp = talloc_vasprintf(context, comment, ap);
         va_end(ap);
-                
+
         context->results->ui_ops->comment(context, tmp);
-        
+
         talloc_free(tmp);
 }
@@ -246 +314 @@
 }
 
+int torture_suite_children_count(const struct torture_suite *suite)
+{
+        int ret = 0;
+        struct torture_tcase *tcase;
+        struct torture_test *test;
+        struct torture_suite *tsuite;
+        for (tcase = suite->testcases; tcase; tcase = tcase->next) {
+                for (test = tcase->tests; test; test = test->next) {
+                        ret++;
+                }
+        }
+        for (tsuite = suite->children; tsuite; tsuite = tsuite->next) {
+                ret ++;
+        }
+        return ret;
+}
+
 /**
  * Run a torture test suite.
@@ -251 +336 @@
 bool torture_run_suite(struct torture_context *context, 
                        struct torture_suite *suite)
+{
+        return torture_run_suite_restricted(context, suite, NULL);
+}
+
+bool torture_run_suite_restricted(struct torture_context *context, 
+                       struct torture_suite *suite, const char **restricted)
 {
         bool ret = true;
         struct torture_tcase *tcase;
         struct torture_suite *tsuite;
-        char *old_testname;
 
         if (context->results->ui_ops->suite_start)
                 context->results->ui_ops->suite_start(context, suite);
 
-        old_testname = context->active_testname;
-        if (old_testname != NULL)
-                context->active_testname = talloc_asprintf(context, "%s-%s", 
-                                                           old_testname, suite->name);
-        else
-                context->active_testname = talloc_strdup(context, suite->name);
+        /* FIXME: Adjust torture_suite_children_count if restricted != NULL */
+        context->results->ui_ops->progress(context,
+                torture_suite_children_count(suite), TORTURE_PROGRESS_SET);
 
         for (tcase = suite->testcases; tcase; tcase = tcase->next) {
-                ret &= torture_run_tcase(context, tcase);
+                ret &= torture_run_tcase_restricted(context, tcase, restricted);
         }
 
         for (tsuite = suite->children; tsuite; tsuite = tsuite->next) {
-                ret &= torture_run_suite(context, tsuite);
-        }
-
-        talloc_free(context->active_testname);
-        context->active_testname = old_testname;
+                context->results->ui_ops->progress(context, 0, TORTURE_PROGRESS_PUSH);
+                ret &= torture_run_suite_restricted(context, tsuite, restricted);
+                context->results->ui_ops->progress(context, 0, TORTURE_PROGRESS_POP);
+        }
 
         if (context->results->ui_ops->suite_finish)
@@ -303 +389 @@
 }
 
+static bool test_needs_running(const char *name, const char **restricted)
+{
+        int i;
+        if (restricted == NULL)
+                return true;
+        for (i = 0; restricted[i]; i++) {
+                if (!strcmp(name, restricted[i]))
+                        return true;
+        }
+        return false;
+}
+
 static bool internal_torture_run_test(struct torture_context *context, 
                                           struct torture_tcase *tcase,
                                           struct torture_test *test,
-                                          bool already_setup)
+                                          bool already_setup,
+                                          const char **restricted)
 {
         bool success;
-        char *old_testname = NULL;
+        char *subunit_testname = NULL;
 
         if (tcase == NULL || strcmp(test->name, tcase->name) != 0) { 
-                old_testname = context->active_testname;
-                context->active_testname = talloc_asprintf(context, "%s-%s", old_testname, test->name);
-        }
+                subunit_testname = talloc_asprintf(context, "%s.%s", tcase->name, test->name);
+        } else {
+                subunit_testname = talloc_strdup(context, test->name);
+        }
+
+        if (!test_needs_running(subunit_testname, restricted))
+                return true;
 
         context->active_tcase = tcase;
@@ -358 +461 @@
         talloc_free(context->last_reason);
 
-        if (tcase == NULL || strcmp(test->name, tcase->name) != 0) { 
-                talloc_free(context->active_testname);
-                context->active_testname = old_testname;
-        }
         context->active_test = NULL;
         context->active_tcase = NULL;
@@ -368 +467 @@
 }
 
-bool torture_run_tcase(struct torture_context *context, 
+bool torture_run_tcase(struct torture_context *context,
                        struct torture_tcase *tcase)
 {
+        return torture_run_tcase_restricted(context, tcase, NULL);
+}
+
+bool torture_run_tcase_restricted(struct torture_context *context,
+                       struct torture_tcase *tcase, const char **restricted)
+{
         bool ret = true;
-        char *old_testname;
         struct torture_test *test;
+        bool setup_succeeded = true;
+        const char * setup_reason = "Setup failed";
 
         context->active_tcase = tcase;
@@ -379 +485 @@
                 context->results->ui_ops->tcase_start(context, tcase);
 
-        if (tcase->fixture_persistent && tcase->setup 
-                && !tcase->setup(context, &tcase->data)) {
-                /* FIXME: Use torture ui ops for reporting this error */
-                fprintf(stderr, "Setup failed: ");
-                if (context->last_reason != NULL)
-                        fprintf(stderr, "%s", context->last_reason);
-                fprintf(stderr, "\n");
+        if (tcase->fixture_persistent && tcase->setup) {
+                setup_succeeded = tcase->setup(context, &tcase->data);
+        }
+
+        if (!setup_succeeded) {
+                /* Uh-oh. The setup failed, so we can't run any of the tests
+                 * in this testcase. The subunit format doesn't specify what
+                 * to do here, so we keep the failure reason, and manually
+                 * use it to fail every test.
+                 */
+                if (context->last_reason != NULL) {
+                        setup_reason = talloc_asprintf(context,
+                                "Setup failed: %s", context->last_reason);
+                }
+        }
+
+        for (test = tcase->tests; test; test = test->next) {
+                if (setup_succeeded) {
+                        ret &= internal_torture_run_test(context, tcase, test,
+                                        tcase->fixture_persistent, restricted);
+                } else {
+                        context->active_tcase = tcase;
+                        context->active_test = test;
+                        torture_ui_test_start(context, tcase, test);
+                        torture_ui_test_result(context, TORTURE_FAIL, setup_reason);
+                }
+        }
+
+        if (setup_succeeded && tcase->fixture_persistent && tcase->teardown &&
+                !tcase->teardown(context, tcase->data)) {
                 ret = false;
-                goto done;
-        }
-
-        old_testname = context->active_testname;
-        context->active_testname = talloc_asprintf(context, "%s-%s", 
-                                                   old_testname, tcase->name);
-        for (test = tcase->tests; test; test = test->next) {
-                ret &= internal_torture_run_test(context, tcase, test, 
-                                tcase->fixture_persistent);
-        }
-        talloc_free(context->active_testname);
-        context->active_testname = old_testname;
-
-        if (tcase->fixture_persistent && tcase->teardown &&
-                !tcase->teardown(context, tcase->data))
-                ret = false;
-
-done:
+        }
+
         context->active_tcase = NULL;
+        context->active_test = NULL;
 
         if (context->results->ui_ops->tcase_finish)
                 context->results->ui_ops->tcase_finish(context, tcase);
 
-        return ret;
+        return (!setup_succeeded) ? false : ret;
 }
 
@@ -417 +531 @@
                                           struct torture_test *test)
 {
-        return internal_torture_run_test(context, tcase, test, false);
+        return internal_torture_run_test(context, tcase, test, false, NULL);
+}
+
+bool torture_run_test_restricted(struct torture_context *context, 
+                                          struct torture_tcase *tcase,
+                                          struct torture_test *test,
+                                          const char **restricted)
+{
+        return internal_torture_run_test(context, tcase, test, false, restricted);
 }
 
@@ -423 +545 @@
                                                         int default_value)
 {
-        return lp_parm_int(test->lp_ctx, NULL, "torture", name, default_value);
+        return lpcfg_parm_int(test->lp_ctx, NULL, "torture", name, default_value);
+}
+
+unsigned long torture_setting_ulong(struct torture_context *test,
+                                    const char *name,
+                                    unsigned long default_value)
+{
+        return lpcfg_parm_ulong(test->lp_ctx, NULL, "torture", name,
+                             default_value);
 }
 
@@ -429 +559 @@
                                                         double default_value)
 {
-        return lp_parm_double(test->lp_ctx, NULL, "torture", name, default_value);
+        return lpcfg_parm_double(test->lp_ctx, NULL, "torture", name, default_value);
 }
 
@@ -435 +565 @@
                                                         bool default_value)
 {
-        return lp_parm_bool(test->lp_ctx, NULL, "torture", name, default_value);
+        return lpcfg_parm_bool(test->lp_ctx, NULL, "torture", name, default_value);
 }
 
@@ -447 +577 @@
         SMB_ASSERT(test->lp_ctx != NULL);
         
-        ret = lp_parm_string(test->lp_ctx, NULL, "torture", name);
+        ret = lpcfg_parm_string(test->lp_ctx, NULL, "torture", name);
 
         if (ret == NULL)
@@ -620 +750 @@
         return test;
 }
+
+void torture_ui_report_time(struct torture_context *context)
+{
+        if (context->results->ui_ops->report_time)
+                context->results->ui_ops->report_time(context);
+}