Changeset 988 for vendor/current/lib/torture

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/lib/torture

Files:

• simple.c (added)
• subunit.c (modified) (3 diffs)
• torture.c (modified) (12 diffs)
• torture.h (modified) (7 diffs)
• torture.pc.in (deleted)
• wscript_build (modified) (1 diff)

vendor/current/lib/torture/subunit.c

@@ -20 +20 @@
 #include "includes.h"
 #include "lib/torture/torture.h"
-#include <subunit/child.h>
+
+static void subunit_send_event(char const * const event,
+                char const * const name,
+                char const * const details)
+{
+        if (NULL == details) {
+                printf("%s: %s\n", event, name);
+        } else {
+                printf("%s: %s [\n", event, name);
+                printf("%s", details);
+                if (details[strlen(details) - 1] != '\n')
+                        puts("");
+                puts("]");
+        }
+        fflush(stdout);
+}
 
 static void torture_subunit_suite_start(struct torture_context *ctx,
@@ -67 +82 @@
 {
         char *fullname = torture_subunit_test_name(context, context->active_tcase, context->active_test);
-        subunit_test_start(fullname);
+        subunit_send_event("test", fullname, NULL);
         torture_subunit_report_time(context);
         talloc_free(fullname);
@@ -76 +91 @@
 {
         char *fullname = torture_subunit_test_name(context, context->active_tcase, context->active_test);
+        const char *result_str = "unknown";
         torture_subunit_report_time(context);
         switch (res) {
         case TORTURE_OK:
-                subunit_test_pass(fullname);
+                result_str = "success";
                 break;
         case TORTURE_FAIL:
-                subunit_test_fail(fullname, reason);
+                result_str = "failure";
                 break;
         case TORTURE_ERROR:
-                subunit_test_error(fullname, reason);
+                result_str = "error";
                 break;
         case TORTURE_SKIP:
-                subunit_test_skip(fullname, reason);
+                result_str = "skip";
                 break;
         }
+        subunit_send_event(result_str, fullname, reason);
         talloc_free(fullname);
 }

vendor/current/lib/torture/torture.c

@@ -89 +89 @@
 
         if (mkdtemp(*tempdir) == NULL) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -155 +155 @@
         if (local_deltree(tctx->outputdir) == -1) {
                 if (errno != 0) {
-                        return map_nt_error_from_unix(errno);
+                        return map_nt_error_from_unix_common(errno);
                 }
                 return NT_STATUS_UNSUCCESSFUL;
@@ -278 +278 @@
         test->data = data;
 
-        DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+        DLIST_ADD_END(tcase->tests, test);
 
         return test;
@@ -297 +297 @@
         tcase->tests = NULL;
 
-        DLIST_ADD_END(suite->testcases, tcase, struct torture_tcase *);
+        DLIST_ADD_END(suite->testcases, tcase);
 
         return true;
@@ -401 +401 @@
 }
 
-static bool internal_torture_run_test(struct torture_context *context, 
+static bool internal_torture_run_test(struct torture_context *context,
                                           struct torture_tcase *tcase,
                                           struct torture_test *test,
@@ -410 +410 @@
         char *subunit_testname = NULL;
 
-        if (tcase == NULL || strcmp(test->name, tcase->name) != 0) { 
+        if (tcase == NULL || strcmp(test->name, tcase->name) != 0) {
                 subunit_testname = talloc_asprintf(context, "%s.%s", tcase->name, test->name);
         } else {
@@ -427 +427 @@
         context->last_result = TORTURE_OK;
 
-        if (!already_setup && tcase->setup && 
-                !tcase->setup(context, &(tcase->data))) {
-                if (context->last_reason == NULL)
+        if (!already_setup && tcase->setup &&
+            !tcase->setup(context, &(tcase->data))) {
+                if (context->last_reason == NULL)
                         context->last_reason = talloc_strdup(context, "Setup failure");
                 context->last_result = TORTURE_ERROR;
                 success = false;
-        } else if (test->dangerous && 
-            !torture_setting_bool(context, "dangerous", false)) {
-            context->last_result = TORTURE_SKIP;
-            context->last_reason = talloc_asprintf(context, 
-                "disabled %s - enable dangerous tests to use", test->name);
-            success = true;
+        } else if (test->dangerous &&
+                   !torture_setting_bool(context, "dangerous", false)) {
+                context->last_result = TORTURE_SKIP;
+                context->last_reason = talloc_asprintf(context,
+                "disabled %s - enable dangerous tests to use", test->name);
+                success = true;
         } else {
-            success = test->run(context, tcase, test);
-
-            if (!success && context->last_result == TORTURE_OK) {
-                    if (context->last_reason == NULL)
-                            context->last_reason = talloc_strdup(context, "Unknown error/failure");
-                    context->last_result = TORTURE_ERROR;
-            }
+                success = test->run(context, tcase, test);
+
+                if (!success && context->last_result == TORTURE_OK) {
+                        if (context->last_reason == NULL)
+                                context->last_reason = talloc_strdup(context,
+                                        "Unknown error/failure. Missing torture_fail() or torture_assert_*() call?");
+                        context->last_result = TORTURE_ERROR;
+                }
         }
 
         if (!already_setup && tcase->teardown && !tcase->teardown(context, tcase->data)) {
-                if (context->last_reason == NULL)
-                    context->last_reason = talloc_strdup(context, "Setup failure");
-                context->last_result = TORTURE_ERROR;
+                if (context->last_reason == NULL)
+                        context->last_reason = talloc_strdup(context, "Setup failure");
+                context->last_result = TORTURE_ERROR;
                 success = false;
         }
 
-        torture_ui_test_result(context, context->last_result, 
+        torture_ui_test_result(context, context->last_result,
                                context->last_reason);
-        
+
         talloc_free(context->last_reason);
+        context->last_reason = NULL;
 
         context->active_test = NULL;
@@ -616 +618 @@
         test->dangerous = false;
 
-        DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+        DLIST_ADD_END(tcase->tests, test);
 
         return tcase;
@@ -650 +652 @@
         test->dangerous = false;
 
-        DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+        DLIST_ADD_END(tcase->tests, test);
 
         return tcase;
@@ -664 +666 @@
                 return false;
 
-        DLIST_ADD_END(suite->children, child, struct torture_suite *);
+        DLIST_ADD_END(suite->children, child);
 
         /* FIXME: Check for duplicates and return false if the 
@@ -715 +717 @@
         test->dangerous = false;
 
-        DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+        DLIST_ADD_END(tcase->tests, test);
 
         return test;
@@ -746 +748 @@
         test->dangerous = false;
 
-        DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+        DLIST_ADD_END(tcase->tests, test);
 
         return test;

vendor/current/lib/torture/torture.h

@@ -289 +289 @@
         do { enum ndr_err_code __got = got, __expected = expected; \
         if (__got != __expected) { \
-                torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %d, expected %d (%s): %s", __got, __expected, __STRING(expected), cmt); \
+                torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %d (%s), expected %d (%s): %s", __got, ndr_errstr(__got), __expected, __STRING(expected), cmt); \
                 return false; \
         }\
         } while(0)
+
+#define torture_assert_hresult_equal(torture_ctx, got, expected, cmt) \
+        do { HRESULT __got = got, __expected = expected; \
+        if (!HRES_IS_EQUAL(__got, __expected)) { \
+                torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %s, expected %s: %s", hresult_errstr(__got), hresult_errstr(__expected), cmt); \
+                return false; \
+        } \
+        } while (0)
 
 #define torture_assert_casestr_equal(torture_ctx,got,expected,cmt) \
@@ -415 +423 @@
         } while(0)
 
+#define torture_assert_int_not_equal(torture_ctx,got,not_expected,cmt)\
+        do { int __got = (got), __not_expected = (not_expected); \
+        if (__got == __not_expected) { \
+                torture_result(torture_ctx, TORTURE_FAIL, \
+                        __location__": "#got" was %d (0x%X), expected a different number: %s", \
+                        __got, __got, cmt); \
+                return false; \
+        } \
+        } while(0)
+
+#define torture_assert_int_not_equal_goto(torture_ctx,got,not_expected,ret,label,cmt)\
+        do { int __got = (got), __not_expected = (not_expected); \
+        if (__got == __not_expected) { \
+                torture_result(torture_ctx, TORTURE_FAIL, \
+                        __location__": "#got" was %d (0x%X), expected a different number: %s", \
+                        __got, __got, cmt); \
+                ret = false; \
+                goto label; \
+        } \
+        } while(0)
+
 #define torture_assert_u64_equal(torture_ctx,got,expected,cmt)\
         do { uint64_t __got = (got), __expected = (expected); \
@@ -440 +469 @@
         } while(0)
 
+#define torture_assert_u64_not_equal(torture_ctx,got,not_expected,cmt)\
+        do { uint64_t __got = (got), __not_expected = (not_expected); \
+        if (__got == __not_expected) { \
+                torture_result(torture_ctx, TORTURE_FAIL, \
+                        __location__": "#got" was %llu (0x%llX), expected a different number: %s", \
+                        (unsigned long long)__got, (unsigned long long)__got, \
+                        cmt); \
+                return false; \
+        } \
+        } while(0)
+
 #define torture_assert_errno_equal(torture_ctx,expected,cmt)\
         do { int __expected = (expected); \
@@ -447 +487 @@
                                            errno, strerror(errno), __expected, \
                                            strerror(__expected), cmt); \
+                return false; \
+        } \
+        } while(0)
+
+#define torture_assert_guid_equal(torture_ctx,got,expected,cmt)\
+        do { struct GUID __got = (got), __expected = (expected); \
+        if (!GUID_equal(&__got, &__expected)) { \
+                torture_result(torture_ctx, TORTURE_FAIL, \
+                        __location__": "#got" was %s, expected %s: %s", \
+                        GUID_string(torture_ctx, &__got), GUID_string(torture_ctx, &__expected), cmt); \
                 return false; \
         } \
@@ -459 +509 @@
         } while(0)
 
+#define torture_assert_sid_equal(torture_ctx,got,expected,cmt)\
+        do { struct dom_sid *__got = (got), *__expected = (expected); \
+        if (!dom_sid_equal(__got, __expected)) { \
+                torture_result(torture_ctx, TORTURE_FAIL, \
+                                           __location__": "#got" was %s, expected %s: %s", \
+                                           dom_sid_string(torture_ctx, __got), dom_sid_string(torture_ctx, __expected), cmt); \
+                return false; \
+        } \
+        } while(0)
+
+#define torture_assert_not_null(torture_ctx,got,cmt)\
+        do { void *__got = (got); \
+        if (__got == NULL) { \
+                torture_result(torture_ctx, TORTURE_FAIL, \
+                        __location__": "#got" was NULL, expected != NULL: %s", \
+                        cmt); \
+                return false; \
+        } \
+        } while(0)
+
+#define torture_assert_not_null_goto(torture_ctx,got,ret,label,cmt)\
+        do { void *__got = (got); \
+        if (__got == NULL) { \
+                torture_result(torture_ctx, TORTURE_FAIL, \
+                        __location__": "#got" was NULL, expected != NULL: %s", \
+                        cmt); \
+                ret = false; \
+                goto label; \
+        } \
+        } while(0)
+
 #define torture_skip(torture_ctx,cmt) do {\
                 torture_result(torture_ctx, TORTURE_SKIP, __location__": %s", cmt);\
@@ -490 +571 @@
 #define torture_assert_ndr_success(torture_ctx,expr,cmt) \
                 torture_assert_ndr_err_equal(torture_ctx,expr,NDR_ERR_SUCCESS,cmt)
+
+#define torture_assert_hresult_ok(torture_ctx,expr,cmt) \
+                torture_assert_hresult_equal(torture_ctx,expr,HRES_ERROR(0), cmt)
 
 /* Getting settings */
@@ -537 +621 @@
 
 extern const struct torture_ui_ops torture_subunit_ui_ops;
+extern const struct torture_ui_ops torture_simple_ui_ops;
 
 #endif /* __TORTURE_UI_H__ */

vendor/current/lib/torture/wscript_build

@@ -2 +2 @@
 
 bld.SAMBA_LIBRARY('torture',
-        source='torture.c subunit.c',
-        vnum='0.0.1',
-        pc_files='torture.pc',
-        public_deps='samba-hostconfig samba-util errors talloc tevent subunit',
-        public_headers='torture.h'
-        )
+    private_library=True,
+    source='torture.c subunit.c simple.c',
+    public_deps='samba-hostconfig samba-util samba-errors talloc tevent',
+    private_headers='torture.h'
+    )