summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-09-21 10:40:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:04 -0500
commit18d4608e4368b2369f320eb870ae01d1746876c7 (patch)
tree81d6eff87576201722d8e06ce8f598b283c34728 /source4/torture
parenta84bdcd1cb4a8e6c265f2c271d849d343696c0c8 (diff)
downloadsamba-18d4608e4368b2369f320eb870ae01d1746876c7.tar.gz
samba-18d4608e4368b2369f320eb870ae01d1746876c7.tar.bz2
samba-18d4608e4368b2369f320eb870ae01d1746876c7.zip
r25279: - test in the generic get_trusted_domains() function that we got
at least 2 domains. - change the ordering of the tests metze (This used to be commit 22eb3095d622e4cee559387900e5a7d9cfb51171)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/winbind/struct_based.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
index 33ed0c79de..5b6ce059a1 100644
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -131,8 +131,11 @@ static bool get_trusted_domains(struct torture_context *torture,
dcount++;
}
-
SAFE_FREE(rep.extra_data.data);
+
+ torture_assert(torture, dcount >= 2,
+ "The list of trusted domain should contain 2 entries");
+
*_d = d;
return true;
}
@@ -211,9 +214,6 @@ static bool torture_winbind_struct_list_trustdom(struct torture_context *torture
*/
}
- torture_assert(torture, i >= 2,
- "The list of trusted domain should contain 2 entries");
-
return true;
}
@@ -243,8 +243,8 @@ struct torture_suite *torture_winbind_struct_init(void)
struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "STRUCT");
torture_suite_add_simple_test(suite, "PING", torture_winbind_struct_ping);
- torture_suite_add_simple_test(suite, "GETDCNAME", torture_winbind_struct_getdcname);
torture_suite_add_simple_test(suite, "LIST_TRUSTDOM", torture_winbind_struct_list_trustdom);
+ torture_suite_add_simple_test(suite, "GETDCNAME", torture_winbind_struct_getdcname);
suite->description = talloc_strdup(suite, "WINBIND - struct based protocol tests");