From: Howard Chu Date: Wed, 7 Feb 2007 17:09:20 +0000 (+0000) Subject: Test modify/undo in back-config X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~45 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6fd5e369073d1249afd3edf646a3c8ee266b7ad6;p=openldap Test modify/undo in back-config --- diff --git a/tests/data/slapd-config-undo.conf b/tests/data/slapd-config-undo.conf new file mode 100644 index 0000000000..d3013c3328 --- /dev/null +++ b/tests/data/slapd-config-undo.conf @@ -0,0 +1,23 @@ +include @SCHEMADIR@/core.schema + +#mod#modulepath ../servers/slapd/back-@BACKEND@/ +#mod#moduleload back_@BACKEND@.la +#monitormod#modulepath ../servers/slapd/back-monitor/ +#monitormod#moduleload back_monitor.la + +database @BACKEND@ +suffix "o=undo" +directory @TESTDIR@/db.1.a +rootdn "cn=Manager,o=undo" +rootpw secret +#bdb#index objectClass eq +#bdb#index cn,sn,uid pres,eq,sub +#hdb#index objectClass eq +#hdb#index cn,sn,uid pres,eq,sub +#ldbm#index objectClass eq +#ldbm#index cn,sn,uid pres,eq,sub + +#monitor#database monitor + +database config +include "configpw.conf" diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index 6731f795a7..8f4e7ad121 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -123,6 +123,7 @@ PLSRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist-ldap.conf PLSRMASTERCONF=$DATADIR/slapd-syncrepl-multiproxy.conf DDSCONF=$DATADIR/slapd-dds.conf PASSWDCONF=$DATADIR/slapd-passwd.conf +UNDOCONF=$DATADIR/slapd-config-undo.conf DYNAMICCONF=$DATADIR/slapd-dynamic.ldif diff --git a/tests/scripts/test051-config-undo b/tests/scripts/test051-config-undo new file mode 100755 index 0000000000..1ee115124e --- /dev/null +++ b/tests/scripts/test051-config-undo @@ -0,0 +1,115 @@ +#! /bin/sh +# $OpenLDAP$ +## This work is part of OpenLDAP Software . +## +## Copyright 1998-2006 The OpenLDAP Foundation. +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted only as authorized by the OpenLDAP +## Public License. +## +## A copy of this license is available in the file LICENSE in the +## top-level directory of the distribution or, alternatively, at +## . + +echo "running defines.sh" +. $SRCDIR/scripts/defines.sh + +mkdir -p $TESTDIR $DBDIR1 + +echo "Running slapadd to build slapd database..." +. $CONFFILTER $BACKEND $MONITORDB < $UNDOCONF > $CONF1 +$SLAPADD -f $CONF1 < $LOG1 2>&1 & +valgrind ../servers/slapd/.libs/lt-slapd -f $CONF1 -F testrun/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & +PID=$! +if test $WAIT != 0 ; then + echo PID $PID + read foo +fi +KILLPIDS="$PID" + +sleep 1 +for i in 0 1 2 3 4 5; do + $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ + 'objectclass=*' > /dev/null 2>&1 + RC=$? + if test $RC = 0 ; then + break + fi + echo "Waiting 5 seconds for slapd to start..." + sleep 5 +done +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo Dynamically assaulting the schema +$LDAPMODIFY -D cn=config -h $LOCALHOST -p $PORT1 -y $CONFIGPWF \ + > $TESTOUT 2>&1 < $TESTOUT 2>&1 <>>>> Test succeeded" + +test $KILLSERVERS != no && wait + +exit 0