Filter results before compare to eliminate modifytime errors.

diff --git a/tests/scripts/acfilter.sh b/tests/scripts/acfilter.sh
new file mode 100755 (executable)
index 0000000..11d116d
--- /dev/null
+++ b/tests/scripts/acfilter.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+grep -v "modifiersname" | \
+grep -v "modifytimestamp" |  \
+grep -v "creatorsname" | \
+grep -v "createtimestamp"  

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 6d8bf2f3914ee96be39d585f33f1b456c70307f4..c0e891c56307810a10d5a9377cdad4879c5b7a78 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -20,7 +20,11 @@ PASSWD=secret
 BABSDN="cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US"
 BJORNSDN="cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US"
 JAJDN="cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US"
+MASTERLOG=$DBDIR/master.log
+SLAVELOG=$DBDIR/slave.log
 SEARCHOUT=$DBDIR/ldapsearch.out
+SEARCHFLT=$DBDIR/ldapsearch.flt
+LDIFFLT=$DBDIR/ldif.flt
 MASTEROUT=$DBDIR/master.out
 SLAVEOUT=$DBDIR/slave.out
 TESTOUT=$DBDIR/ldapsearch.out

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index c04d1f5f651563490d48c84af5991a70b06ebccb..2398b029f6245fc9141212eb6e65a51ae6ca796f 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -5,10 +5,10 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/*
+rm -f $DBDIR/[^C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to check that slapd is running..."
@@ -44,8 +44,10 @@ if [ $RC != 0 ]; then
        exit $RC
 fi
 
+. scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+. scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing retrieved entries to LDIF file used to create database"
-cmp $SEARCHOUT $LDIF
+cmp $SEARCHFLT $LDIFFLT
 if [ $? != 0 ]; then
        echo "comparison failed - database was not created correctly"
        exit 1