svn commit: samba r12075 - in branches/SAMBA_4_0/source: script/tests torture torture/nbt

[metze at samba.org]

Author: metze
Date: 2005-12-05 15:47:15 +0000 (Mon, 05 Dec 2005)
New Revision: 12075

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

Log:
remove NBT-WINSREPLICATION-QUICK test, as we now pass the NBT-WINSREPLICATION
test

metze
Modified:
   branches/SAMBA_4_0/source/script/tests/test_nbt.sh
   branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
   branches/SAMBA_4_0/source/torture/torture.c


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_nbt.sh	2005-12-05 15:26:49 UTC (rev 12074)
+++ branches/SAMBA_4_0/source/script/tests/test_nbt.sh	2005-12-05 15:47:15 UTC (rev 12075)
@@ -21,7 +21,7 @@
 testit "nmblookup -U $SERVER $SERVER" bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER || failed=`expr $failed + 1`
 testit "nmblookup $SERVER" bin/nmblookup $TORTURE_OPTIONS $SERVER || failed=`expr $failed + 1`
 
-for f in NBT-REGISTER NBT-WINS NBT-WINSREPLICATION-QUICK; do
+for f in NBT-REGISTER NBT-WINS NBT-WINSREPLICATION; do
     testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1`
 done
 

Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-12-05 15:26:49 UTC (rev 12074)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-12-05 15:47:15 UTC (rev 12075)
@@ -9477,45 +9477,6 @@
 /*
   test WINS replication operations
 */
-BOOL torture_nbt_winsreplication_quick(void)
-{
-	const char *address;
-	struct nbt_name name;
-	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"));
-
-	/* do an initial name resolution to find its IP */
-	status = resolve_name(&name, mem_ctx, &address, NULL);
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("Failed to resolve %s - %s\n",
-		       name.name, nt_errstr(status));
-		talloc_free(mem_ctx);
-		return False;
-	}
-
-	ret &= test_assoc_ctx1(mem_ctx, address);
-	ret &= test_assoc_ctx2(mem_ctx, address);
-
-	ret &= test_wins_replication(mem_ctx, address);
-
-	ctx = test_create_conflict_ctx(mem_ctx, address);
-	if (!ctx) return False;
-
-	ret &= test_conflict_same_owner(ctx);
-	ret &= test_conflict_owned_released_vs_replica(ctx);
-
-	talloc_free(mem_ctx);
-
-	return ret;
-}
-
-/*
-  test WINS replication operations
-*/
 BOOL torture_nbt_winsreplication(void)
 {
 	const char *address;

Modified: branches/SAMBA_4_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture.c	2005-12-05 15:26:49 UTC (rev 12074)
+++ branches/SAMBA_4_0/source/torture/torture.c	2005-12-05 15:47:15 UTC (rev 12075)
@@ -2336,7 +2336,6 @@
 	{"NBT-REGISTER", torture_nbt_register, 0},
 	{"NBT-WINS", torture_nbt_wins, 0},
 	{"NBT-DGRAM", torture_nbt_dgram, 0},
-	{"NBT-WINSREPLICATION-QUICK", torture_nbt_winsreplication_quick, 0},
 	{"NBT-WINSREPLICATION", torture_nbt_winsreplication, 0},
 	
 	/* libnet tests */