1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00

torture: fix whitespace/tab mixup in internal_torture_run_test()

No diff visible with "git show|diff -w".

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Mon Sep  8 04:21:52 CEST 2014 on sn-devel-104
This commit is contained in:
Michael Adam 2014-08-20 15:25:17 +02:00 committed by Martin Schwenke
parent 8c3e0f84cc
commit b760056f84

View File

@ -427,32 +427,32 @@ static bool internal_torture_run_test(struct torture_context *context,
context->last_result = TORTURE_OK;
if (!already_setup && tcase->setup &&
!tcase->setup(context, &(tcase->data))) {
if (context->last_reason == NULL)
!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;
!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);
success = test->run(context, tcase, test);
if (!success && context->last_result == TORTURE_OK) {
if (context->last_reason == NULL)
context->last_reason = talloc_strdup(context,
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;
}
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;
}