svn commit: samba r11882 - in branches/SAMBA_4_0/source/torture/nbt: .

[metze at samba.org]

Author: metze
Date: 2005-11-23 12:30:57 +0000 (Wed, 23 Nov 2005)
New Revision: 11882

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

Log:
- use some better names
- we now pass the same_owner tests so test them with make test

metze
Modified:
   branches/SAMBA_4_0/source/torture/nbt/winsreplication.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-11-23 12:29:37 UTC (rev 11881)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-11-23 12:30:57 UTC (rev 11882)
@@ -8382,7 +8382,7 @@
 	 */
 	{
 		.line	= __location__,
-		.name	= _NBT_NAME("_MA_MA_SB_C", 0x00, NULL),
+		.name	= _NBT_NAME("_MA_MA_SB_PRA", 0x00, NULL),
 		.skip	= (ctx->addresses_all_num < 3),
 		.wins	= {
 			.nb_flags	= 0,
@@ -8476,7 +8476,7 @@
 	{
 		.line	= __location__,
 		.section= "Test Replica vs. owned active: some more UNIQUE,MHOMED combinations",
-		.name	= _NBT_NAME("_MA_UA_SB_A", 0x00, NULL),
+		.name	= _NBT_NAME("_MA_UA_SB_P", 0x00, NULL),
 		.skip	= (ctx->addresses_all_num < 3),
 		.wins	= {
 			.nb_flags	= 0,
@@ -9249,6 +9249,7 @@
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	NTSTATUS status;
 	BOOL ret = True;
+	struct test_wrepl_conflict_conn *ctx;
 
 	make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
 
@@ -9266,6 +9267,10 @@
 
 	ret &= test_wins_replication(mem_ctx, address);
 
+	ctx = test_create_conflict_ctx(mem_ctx, address);
+
+	ret &= test_conflict_same_owner(ctx);
+
 	talloc_free(mem_ctx);
 
 	return ret;