Added filter to populate test

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 3e7e65f12a2446f50515ae31c2aeb88613dc1365..cacc155837237d97c986674bf5ba98474641a0e9 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -24,6 +24,8 @@ MASTERLOG=$DBDIR/master.log
 SLAVELOG=$DBDIR/slave.log
 SLURPLOG=$DBDIR/slurp.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 62d6923bbc1578ce438c278d2e01a5f9a32ab7d1..e3db47ca25cf5705ed4387c1c8302604bca23453 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -44,8 +44,12 @@ if [ $RC != 0 ]; then
        exit $RC
 fi
 
-echo "Comparing retrieved entries to LDIF file used to create database"
-cmp $SEARCHOUT $LDIF
+echo "Filtering ldapsearch results..."
+. scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+echo "Filtering original ldif used to create database..."
+. scripts/acfilter.sh < $LDIF > $LDIFFLT
+echo "Comparing filter output..."
+cmp $SEARCHFLT $LDIFFLT
 if [ $? != 0 ]; then
        echo "comparison failed - database was not created correctly"
        exit 1