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

metze

diff --git a/source/script/tests/selftest.sh b/source/script/tests/selftest.sh
index 4066ebaac20e13bf12a50746a8f8116ae077b78f..73dce74fb6ebf29f25e29cda320b85348598c0f5 100755 (executable)
--- a/source/script/tests/selftest.sh
+++ b/source/script/tests/selftest.sh
@@ -51,6 +51,7 @@ PRIVATEDIR=$PREFIX_ABS/private
 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 @@ export PATH
 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 @@ echo -n "PROVISIONING..."
     --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

diff --git a/source/script/tests/test_nbt.sh b/source/script/tests/test_nbt.sh
index ff3bf14487679bc941076f909667b7ccefac27c7..1537617241ea6f3d80cfc25ed3f5015604adc405 100755 (executable)
--- a/source/script/tests/test_nbt.sh
+++ b/source/script/tests/test_nbt.sh
@@ -18,8 +18,12 @@ SCRIPTDIR=../testprogs/ejs
 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

diff --git a/source/torture/nbt/winsreplication.c b/source/torture/nbt/winsreplication.c
index 8ef1cf5c15a76d0773cfc082aa5ff7cd74caf96d..4af01ac1c94f339ca3f65f692d91f74da751806d 100644 (file)
--- a/source/torture/nbt/winsreplication.c
+++ b/source/torture/nbt/winsreplication.c
@@ -8326,6 +8326,8 @@ BOOL torture_nbt_winsreplication_quick(void)
        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;