sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s4-torture: provide correct torture failures for failure to connect

Browse Source
This commit is contained in:
Andrew Bartlett 2012-05-18 14:22:27 +10:00
parent 8e5badc256
commit e919cadcca
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source4/torture/util_smb.c
View File

@ -815,18 +815,17 @@ static bool wrap_simple_2smb_test(struct torture_context *torture_ctx,
{ {
bool (*fn) (struct torture_context *, struct smbcli_state *, bool (*fn) (struct torture_context *, struct smbcli_state *,
struct smbcli_state *); struct smbcli_state *);
bool ret; bool ret = true;
struct smbcli_state *cli1, *cli2; struct smbcli_state *cli1 = NULL, *cli2 = NULL;
if (!torture_open_connection(&cli1, torture_ctx, 0) || torture_assert_goto(torture_ctx, torture_open_connection(&cli1, torture_ctx, 0), ret, fail, "Failed to open connection");
!torture_open_connection(&cli2, torture_ctx, 1)) torture_assert_goto(torture_ctx, torture_open_connection(&cli2, torture_ctx, 1), ret, fail, "Failed to open connection");
return false;
fn = test->fn; fn = test->fn;
ret = fn(torture_ctx, cli1, cli2); ret = fn(torture_ctx, cli1, cli2);
fail:
talloc_free(cli1); talloc_free(cli1);
talloc_free(cli2); talloc_free(cli2);
@ -866,17 +865,16 @@ static bool wrap_simple_1smb_test(struct torture_context *torture_ctx,
struct torture_test *test) struct torture_test *test)
{ {
bool (*fn) (struct torture_context *, struct smbcli_state *); bool (*fn) (struct torture_context *, struct smbcli_state *);
bool ret; bool ret = true;
struct smbcli_state *cli1; struct smbcli_state *cli1 = NULL;
if (!torture_open_connection(&cli1, torture_ctx, 0)) torture_assert_goto(torture_ctx, torture_open_connection(&cli1, torture_ctx, 0), ret, fail, "Failed to open connection");
return false;
fn = test->fn; fn = test->fn;
ret = fn(torture_ctx, cli1); ret = fn(torture_ctx, cli1);
fail:
talloc_free(cli1); talloc_free(cli1);
return ret; return ret;