svn commit: samba r25279 - in branches/SAMBA_4_0/source/torture/winbind: .

[metze at samba.org]

Author: metze
Date: 2007-09-21 10:40:10 +0000 (Fri, 21 Sep 2007)
New Revision: 25279

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25279

Log:
- test in the generic get_trusted_domains() function that we got
  at least 2 domains.
- change the ordering of the tests

metze
Modified:
   branches/SAMBA_4_0/source/torture/winbind/struct_based.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/winbind/struct_based.c
===================================================================
--- branches/SAMBA_4_0/source/torture/winbind/struct_based.c	2007-09-21 10:36:51 UTC (rev 25278)
+++ branches/SAMBA_4_0/source/torture/winbind/struct_based.c	2007-09-21 10:40:10 UTC (rev 25279)
@@ -131,8 +131,11 @@
 
 		dcount++;
 	}
+	SAFE_FREE(rep.extra_data.data);
 
-	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 @@
 		 */
 	}
 
-	torture_assert(torture, i >= 2,
-		       "The list of trusted domain should contain 2 entries");
-
 	return true;
 }
 
@@ -243,8 +243,8 @@
 	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, "LIST_TRUSTDOM", torture_winbind_struct_list_trustdom);
 	torture_suite_add_simple_test(suite, "GETDCNAME", torture_winbind_struct_getdcname);
-	torture_suite_add_simple_test(suite, "LIST_TRUSTDOM", torture_winbind_struct_list_trustdom);
 
 	suite->description = talloc_strdup(suite, "WINBIND - struct based protocol tests");