sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

torture: Reorder torture_winbind_struct_domain_info tests

Browse Source 
This tries to ensure we get enough information to debug this
intermittent failure.

I think this may be a real failure, but it is hard to tell without more info.

This patch prints out the full details of what the domain returned before
doing the assertions.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Andrew Bartlett 2014-10-05 16:00:47 +13:00 committed by Michael Adam
parent 88b24858d8
commit 7b4f266ef0
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source4/torture/winbind/struct_based.c
View File

@ -428,22 +428,6 @@ static bool torture_winbind_struct_domain_info(struct torture_context *torture)
DO_STRUCT_REQ_REP(WINBINDD_DOMAIN_INFO, &req, &rep);
torture_assert_str_equal(torture,
rep.data.domain_info.name,
listd[i].netbios_name,
"Netbios domain name doesn't match");
torture_assert_str_equal(torture,
rep.data.domain_info.alt_name,
listd[i].dns_name,
"DNS domain name doesn't match");
sid = dom_sid_parse_talloc(torture, rep.data.domain_info.sid);
torture_assert(torture, sid, "Failed to parse SID");
ok = dom_sid_equal(listd[i].sid, sid);
torture_assert(torture, ok, "SID's doesn't match");
if (rep.data.domain_info.primary) {
flagstr = talloc_strdup_append(flagstr, "PR ");
}
@ -462,10 +446,27 @@ static bool torture_winbind_struct_domain_info(struct torture_context *torture)
flagstr = talloc_strdup_append(flagstr, "NA ");
}
torture_comment(torture, "DOMAIN '%s' => '%s' [%s]\n",
torture_comment(torture, "DOMAIN '%s' => '%s' [%s] [%s]\n",
rep.data.domain_info.name,
rep.data.domain_info.alt_name,
flagstr);
flagstr,
rep.data.domain_info.sid);
sid = dom_sid_parse_talloc(torture, rep.data.domain_info.sid);
torture_assert(torture, sid, "Failed to parse SID");
ok = dom_sid_equal(listd[i].sid, sid);
torture_assert(torture, ok, "SID's doesn't match");
torture_assert_str_equal(torture,
rep.data.domain_info.name,
listd[i].netbios_name,
"Netbios domain name doesn't match");
torture_assert_str_equal(torture,
rep.data.domain_info.alt_name,
listd[i].dns_name,
"DNS domain name doesn't match");
}
return true;