[Opensync-commits] r5535 - plugins/ldap-sync/tests

[<svn...@op...>]

Author: scriptor
Date: Sat Apr  4 23:49:57 2009
New Revision: 5535
URL: http://www.opensync.org/changeset/5535

Log:
Replacing "|| exit 1" by a solution, that defers the exit until 
after the TMPDIR has been removed.

Added:
   plugins/ldap-sync/tests/check_osynctool_add_file_and_valgrind_and_slowsync   (contents, props changed)
Modified:
   plugins/ldap-sync/tests/check_add_modify_delete_and_sync
   plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_sync
   plugins/ldap-sync/tests/check_connect
   plugins/ldap-sync/tests/check_fastsync
   plugins/ldap-sync/tests/check_init
   plugins/ldap-sync/tests/check_modify_and_fastsync
   plugins/ldap-sync/tests/check_slowsync
   plugins/ldap-sync/tests/check_sync

Modified: plugins/ldap-sync/tests/check_add_modify_delete_and_sync
==============================================================================
--- plugins/ldap-sync/tests/check_add_modify_delete_and_sync	Sat Apr  4 23:49:35 2009	(r5534)
+++ plugins/ldap-sync/tests/check_add_modify_delete_and_sync	Sat Apr  4 23:49:57 2009	(r5535)
@@ -195,7 +195,14 @@
 
 TMPDIR=`mktemp -d /tmp/ldap_sync_test.XXXXXX` || exit 1
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect $SYNCMETHOD --syncdone --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect $SYNCMETHOD --syncdone --disconnect --finalize
+
+rv=$?
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+
 
 
 
@@ -211,7 +218,13 @@
 fi
 
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect $SYNCMETHOD --syncdone --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect $SYNCMETHOD --syncdone --disconnect --finalize
+rv=$?
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+
 
 
 
@@ -242,7 +255,9 @@
 
 
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect $SYNCMETHOD --syncdone --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect $SYNCMETHOD --syncdone --disconnect --finalize
+rv=$?
+
 
 
 if test -d "$TMPDIR"; then
@@ -250,3 +265,8 @@
 fi
 
 
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+

Modified: plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_sync
==============================================================================
--- plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_sync	Sat Apr  4 23:49:35 2009	(r5534)
+++ plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_sync	Sat Apr  4 23:49:57 2009	(r5535)
@@ -438,7 +438,11 @@
 
 
 ########## Synchronize #############
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect $SYNCMETHOD --syncdone --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect $SYNCMETHOD --syncdone --disconnect --finalize
+
+rv=$?
+
+
 
 
 if test -d "$TMPDIR"; then
@@ -446,3 +450,8 @@
 fi
 
 
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+

Modified: plugins/ldap-sync/tests/check_connect
==============================================================================
--- plugins/ldap-sync/tests/check_connect	Sat Apr  4 23:49:35 2009	(r5534)
+++ plugins/ldap-sync/tests/check_connect	Sat Apr  4 23:49:57 2009	(r5535)
@@ -73,7 +73,9 @@
 
 echo "$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --disconnect --finalize"
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --disconnect --finalize
+
+rv=$?
 
 
 if test -d "$TMPDIR"; then
@@ -81,3 +83,8 @@
 fi
 
 
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+

Modified: plugins/ldap-sync/tests/check_fastsync
==============================================================================
--- plugins/ldap-sync/tests/check_fastsync	Sat Apr  4 23:49:35 2009	(r5534)
+++ plugins/ldap-sync/tests/check_fastsync	Sat Apr  4 23:49:57 2009	(r5535)
@@ -69,10 +69,16 @@
 
 TMPDIR=`mktemp -d /tmp/ldap_sync_test.XXXXXX` || exit 1
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --fastsync --syncdone --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --fastsync --syncdone --disconnect --finalize
+rv=$?
 
 if test -d "$TMPDIR"; then
   rm -rf "$TMPDIR"
 fi
 
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+
 

Modified: plugins/ldap-sync/tests/check_init
==============================================================================
--- plugins/ldap-sync/tests/check_init	Sat Apr  4 23:49:35 2009	(r5534)
+++ plugins/ldap-sync/tests/check_init	Sat Apr  4 23:49:57 2009	(r5535)
@@ -73,10 +73,18 @@
 
 TMPDIR=`mktemp -d /tmp/ldap_sync_test.XXXXXX` || exit 1
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --finalize
+
+rv=$?
+
 
 if test -d "$TMPDIR"; then
   rm -rf "$TMPDIR"
 fi
 
 
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+

Modified: plugins/ldap-sync/tests/check_modify_and_fastsync
==============================================================================
--- plugins/ldap-sync/tests/check_modify_and_fastsync	Sat Apr  4 23:49:35 2009	(r5534)
+++ plugins/ldap-sync/tests/check_modify_and_fastsync	Sat Apr  4 23:49:57 2009	(r5535)
@@ -132,9 +132,16 @@
 
 TMPDIR=`mktemp -d /tmp/ldap_sync_test.XXXXXX` || exit 1
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --fastsync --syncdone --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --fastsync --syncdone --disconnect --finalize
+rv=$?
 
 if test -d "$TMPDIR"; then
   rm -rf "$TMPDIR"
 fi
 
+
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+

Added: plugins/ldap-sync/tests/check_osynctool_add_file_and_valgrind_and_slowsync
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ plugins/ldap-sync/tests/check_osynctool_add_file_and_valgrind_and_slowsync	Sat Apr  4 23:49:57 2009	(r5535)
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+set -x
+
+FILE=$0
+OSYNCTOOL=$(which osynctool 2>/dev/null)
+if test ! -f "$OSYNCTOOL"; then
+	echo "$FILE:$LINENO: ERROR: osynctool could not be found. Exiting."
+	exit 1
+fi
+
+if test ! -x "$OSYNCTOOL"; then
+	echo "$FILE:$LINENO: ERROR: osynctool could be found, but it is not executable. Exiting."
+	exit 1
+fi
+
+
+
+PLUGINNAME="ldap-sync"
+PLUGINPATH="$1/src"
+CFG="$2/src/$PLUGINNAME"
+OBJECTTYPE="$3"
+XMLFILE="$4"
+
+
+SOURCE_DIR=`dirname $FILE`
+if test ! -d "$SOURCE_DIR"; then
+  echo "$FILE:$LINENO: ERROR: \"$SOURCE_DIR\" is not a directory. Exiting."
+  exit 1
+fi
+
+if test ! -r "$SOURCE_DIR/test.conf"; then
+  echo "$FILE:$LINENO: ERROR: \"$SOURCE_DIR/test.conf\" could not be read. Exiting."
+  exit 1
+fi
+
+if test ! -r "$SOURCE_DIR/check_osynctool_common.inc"; then
+  echo "$FILE:$LINENO: ERROR: \"$SOURCE_DIR/test.conf\" could not be read. Exiting."
+  exit 1
+fi
+
+source "$SOURCE_DIR/test.conf"
+source "$SOURCE_DIR/check_osynctool_common.inc"
+
+echo "PLUGINPATH = \"$PLUGINPATH\""
+echo "CFG        = \"$CFG\""
+
+
+if test -n "$TRACE_FILES"; then
+  echo "$FILE:$LINENO: Enabling OSYNC_TRACE."
+	if test ! -d "$TRACE_FILES"; then
+    mkdir -p "$TRACE_FILES"
+  fi	
+  export OSYNC_TRACE="$TRACE_FILES"
+fi
+
+
+if test -z "$XMLFILE"; then
+	echo "$FILE:$LINENO: ERROR: \$XMLFILE is empty. Exiting."
+	exit 1
+fi
+
+if test ! -f "$XMLFILE"; then
+	echo "$FILE:$LINENO: ERROR: \"$XMLFILE\" could not be found. Exiting."
+	exit 1
+fi
+
+if test ! -r "$XMLFILE"; then
+	echo "$FILE:$LINENO: ERROR: \"$XMLFILE\" could be found, but it is not readable. Exiting."
+	exit 1
+fi
+
+
+if test -z "$VALGRIND"; then
+  echo "$FILE:$LINENO: ERROR: \$VALGRIND is empty. Exiting.";
+  exit 1;
+fi
+
+
+
+
+
+TMPDIR=`mktemp -d /tmp/ldap_sync_test.XXXXXX` || exit 1
+echo "TMPDIR     = \"$TMPDIR\""
+
+
+
+
+# Set up test group
+prologue;
+
+# Empty LDAP DIT
+$SOURCE_DIR/remove_test_ldifs
+
+# Remove entry from directory used by file-sync
+remove_file_by_objtype "$OBJECTTYPE"
+
+# Add XML file
+add_file "$OBJECTTYPE" "$XMLFILE"
+rv=$?
+if test $rv -ne 0; then
+	echo "$FILE:$LINENO: ERROR: add_file() has failed."
+	exit 1;
+fi
+
+# osynctool should synchronize only one particular object type:
+enable_only "$OBJECTTYPE"
+
+# Trigger synchronization
+valgrind_slow_sync "$OBJECTTYPE"
+rv=$?
+
+# Shut down test group
+epilogue
+
+
+if test -d "$TMPDIR"; then
+  rm -rf "$TMPDIR"
+fi
+
+
+exit $rv

Modified: plugins/ldap-sync/tests/check_slowsync
==============================================================================
--- plugins/ldap-sync/tests/check_slowsync	Sat Apr  4 23:49:35 2009	(r5534)
+++ plugins/ldap-sync/tests/check_slowsync	Sat Apr  4 23:49:57 2009	(r5535)
@@ -70,10 +70,16 @@
 
 TMPDIR=`mktemp -d /tmp/ldap_sync_test.XXXXXX` || exit 1
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --slowsync --syncdone --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --slowsync --syncdone --disconnect --finalize
+
+rv=$?
 
 if test -d "$TMPDIR"; then
   rm -rf "$TMPDIR"
 fi
 
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
 

Modified: plugins/ldap-sync/tests/check_sync
==============================================================================
--- plugins/ldap-sync/tests/check_sync	Sat Apr  4 23:49:35 2009	(r5534)
+++ plugins/ldap-sync/tests/check_sync	Sat Apr  4 23:49:57 2009	(r5535)
@@ -73,9 +73,17 @@
 
 TMPDIR=`mktemp -d /tmp/ldap_sync_test.XXXXXX` || exit 1
 
-$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --sync --syncdone --disconnect --finalize || exit 1
+$OSYNCPLUGIN --plugin $PLUGINNAME --pluginpath $PLUGINPATH --config $CFG --configdir $TMPDIR --initialize --connect --sync --syncdone --disconnect --finalize
+rv=$?
+
 
 if test -d "$TMPDIR"; then
 	rm -rf "$TMPDIR"
 fi
 
+
+if test $rv -ne 0; then
+  echo "$FILE:$LINENO: ERROR: osyncplugin has failed. Exiting."
+  exit 1
+fi
+