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

[metze at samba.org]

Author: metze
Date: 2005-11-03 19:22:01 +0000 (Thu, 03 Nov 2005)
New Revision: 11489

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

Log:
add the one replication cycle test to NBT-WINSREPLICATION-QUICK

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


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.sh	2005-11-03 19:12:36 UTC (rev 11488)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh	2005-11-03 19:22:01 UTC (rev 11489)
@@ -51,6 +51,7 @@
 NCALRPCDIR=$PREFIX_ABS/ncalrpc
 LOCKDIR=$PREFIX_ABS/lockdir
 TLSDIR=$PRIVATEDIR/tls
+WINS_LDB=$PRIVATEDIR/wins.ldb
 CONFIGURATION="--configfile=$CONFFILE"
 export CONFIGURATION
 export CONFFILE
@@ -80,6 +81,19 @@
 rm -rf $PREFIX/*
 mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR
 
+cat >$PRIVATEDIR/wins.ldif<<EOF
+dn: name=127.0.0.1,CN=PARTNERS
+objectClass: wreplPartner
+name: 127.0.0.1
+address: 127.0.0.1
+pullRetryInterval: 100
+pullInterval: 200
+type: 0x2
+EOF
+
+WREPL_TORTURE_OPTIONS=
+export WREPL_TORTURE_OPTIONS
+
 cat >$CONFFILE<<EOF
 [global]
 	netbios name = $SERVER
@@ -141,6 +155,8 @@
     --quiet --domain $DOMAIN --realm $REALM \
     --adminpass $PASSWORD --root=$ROOT || exit 1
 
+./bin/ldbadd -H $PRIVATEDIR/wins.ldb < $PRIVATEDIR/wins.ldif || exit 1
+
 echo "DONE"
 
 if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then

Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_nbt.sh	2005-11-03 19:12:36 UTC (rev 11488)
+++ branches/SAMBA_4_0/source/script/tests/test_nbt.sh	2005-11-03 19:22:01 UTC (rev 11489)
@@ -18,8 +18,12 @@
 PATH=bin:$PATH
 export PATH
 
-for f in NBT-REGISTER NBT-WINS NBT-WINSREPLICATION-QUICK; do
+for f in NBT-REGISTER NBT-WINS; do
     testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1`
 done
 
+for f in NBT-WINSREPLICATION-QUICK; do
+    testit "$f" bin/smbtorture $TORTURE_OPTIONS $WREPL_TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1`
+done
+
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-11-03 19:12:36 UTC (rev 11488)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-11-03 19:22:01 UTC (rev 11489)
@@ -8326,6 +8326,8 @@
 	ret &= test_assoc_ctx1(mem_ctx, address);
 	ret &= test_assoc_ctx2(mem_ctx, address);
 
+	ret &= test_wins_replication(mem_ctx, address);
+
 	talloc_free(mem_ctx);
 
 	return ret;