cleanup

diff --git a/tests/data/regressions/its4184/adds.ldif b/tests/data/regressions/its4184/adds.ldif
index 19acd0d39c6a4784c46c8022ed92027c8b0821a4..716e341d01c2d0036188a781de4d4cea007ba87d 100644 (file)
--- a/tests/data/regressions/its4184/adds.ldif
+++ b/tests/data/regressions/its4184/adds.ldif
@@ -22,7 +22,7 @@ cn: User 1
 sn: User 1
 uid: user1
 uidNumber: 500
-userPassword: {crypt}675B8Gwn6RJyY
+userPassword: abc
 homeDirectory: /home/user1
 gidNumber: 10
 gecos: User 1
@@ -47,7 +47,7 @@ homeDirectory: /home/user3
 loginShell: /bin/false
 gecos: Slave
 gidNumber: 100
-userPassword: {crypt}675B8Gwn6RJyY
+userPassword: abc
 cn: Slave
 sn: Slave
 
@@ -62,7 +62,7 @@ gecos: User 2
 loginShell: /bin/false
 homeDirectory: /home/user2
 gidNumber: 100
-userPassword: {crypt}675B8Gwn6RJyY
+userPassword: abc
 
 dn: ou=Special,dc=example,dc=com
 objectClass: organizationalUnit
@@ -78,6 +78,6 @@ uidNumber: 6319
 homeDirectory: /home/special1
 gecos: Special1
 loginShell: /bin/false
-userPassword: {crypt}675B8Gwn6RJyY
+userPassword: abc
 gidNumber: 100
 

diff --git a/tests/data/regressions/its4184/its4184 b/tests/data/regressions/its4184/its4184
index c69aef5fc4ef575e0865fdd348d30805b4c184ec..901db13a3f5fe2871773d608a46f9504abb703a0 100755 (executable)
--- a/tests/data/regressions/its4184/its4184
+++ b/tests/data/regressions/its4184/its4184
@@ -88,4 +88,7 @@ done
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/data/regressions/its4184/slapd.conf b/tests/data/regressions/its4184/slapd.conf
index 0f544c79642dd970f50efef1cc1b0defba2ffbcd..cf6828b387d890b84e60c83ba432a789d081d414 100644 (file)
--- a/tests/data/regressions/its4184/slapd.conf
+++ b/tests/data/regressions/its4184/slapd.conf
@@ -42,8 +42,10 @@ directory    @TESTDIR@/db.2.a
 
 # Indices to maintain
 #bdb#index             default pres,eq
+#bdb#index             objectClass eq
 #bdb#index             sn pres,eq,sub
 #hdb#index             default pres,eq
+#hdb#index             objectClass eq
 #hdb#index             sn pres,eq,sub
 
 database       @BACKEND@
@@ -54,9 +56,9 @@ directory     @TESTDIR@/db.1.a
 
 # Indices to maintain
 #bdb#index             default pres,eq
-#bdb#index             sn pres,eq,sub
 #bdb#index             objectClass eq
+#bdb#index             sn pres,eq,sub
 #hdb#index             default pres,eq
-#hdb#index             sn pres,eq,sub
 #hdb#index             objectClass eq
+#hdb#index             sn pres,eq,sub
 

diff --git a/tests/data/regressions/its4326/its4326 b/tests/data/regressions/its4326/its4326
index 0d8c5dab4ce0858510628cd71b610e350a0de54c..906945cc1635a2de5bd79fc4a2c2b7ace66e6e87 100755 (executable)
--- a/tests/data/regressions/its4326/its4326
+++ b/tests/data/regressions/its4326/its4326
@@ -64,21 +64,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Running slapadd to create glue entry..."
-. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
-#$SLAPADD -f $CONF2 << EODATA
-#dn: dc=example,dc=com
-#objectClass: domain
-#dc: example
-#EODATA
-#RC=$?
-#if test $RC != 0 ; then
-#      echo "slapadd failed ($RC)!"
-#      test $KILLSERVERS != no && kill -HUP $KILLPIDS
-#      exit $RC
-#fi
-
 echo "Starting proxy slapd on TCP/IP port $PORT2..."
+. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
@@ -128,7 +115,7 @@ if test $RC != 0 ; then
 fi
 
 SLEEP=2
-echo "Stopping the provider and sleeping $SLEEP seconds..."
+echo "Stopping the server and sleeping $SLEEP seconds..."
 kill -HUP "$SERVERPID"
 wait $SERVERPID
 sleep $SLEEP

diff --git a/tests/scripts/its-all b/tests/scripts/its-all
index f012184528cf73940243c50e2b407e1a2ae4f7ad..972a2b7639e5d8d59ae2a8d7f368ba84273afae5 100755 (executable)
--- a/tests/scripts/its-all
+++ b/tests/scripts/its-all
@@ -16,7 +16,6 @@
 SHTOOL="$SRCDIR/../build/shtool"
 TB=`$SHTOOL echo -e "%B"`
 TN=`$SHTOOL echo -e "%b"`
-SLEEPTIME=10
 
 echo "#######################################################################"
 echo "###                                                                 ###"
@@ -46,6 +45,5 @@ for CMD in $SRCDIR/data/regressions/its*/its*; do
        fi
 
        echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
-       sleep $SLEEPTIME
        echo ""
 done