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

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

Author: scriptor
Date: Tue Mar 31 20:28:44 2009
New Revision: 5495
URL: http://www.opensync.org/changeset/5495

Log:
Added mkdir -p... for the trace files.
Adding/Removing tests.

Modified:
   plugins/ldap-sync/tests/CMakeLists.txt
   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_add_modify_delete_four_ldifs_and_valgrind_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_osyncplugin1
   plugins/ldap-sync/tests/check_osynctool1
   plugins/ldap-sync/tests/check_osynctool2
   plugins/ldap-sync/tests/check_osynctool_add_file_and_sync
   plugins/ldap-sync/tests/check_osynctool_add_file_and_valgrind_and_sync
   plugins/ldap-sync/tests/check_osynctool_add_ldif_and_sync
   plugins/ldap-sync/tests/check_osynctool_add_ldif_and_valgrind_and_sync
   plugins/ldap-sync/tests/check_osynctool_common.inc
   plugins/ldap-sync/tests/check_osynctool_file1
   plugins/ldap-sync/tests/check_slowsync
   plugins/ldap-sync/tests/check_sync

Modified: plugins/ldap-sync/tests/CMakeLists.txt
==============================================================================
--- plugins/ldap-sync/tests/CMakeLists.txt	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/CMakeLists.txt	Tue Mar 31 20:28:44 2009	(r5495)
@@ -416,7 +416,7 @@
 
 
 ############################
-# Now osyncplugin with valgrind...
+# Now osyncplugin under valgrind...
 IF (LDAPADD_EXECUTABLE)
 	IF (LDAPMODIFY_EXECUTABLE)
 		IF (LDAPDELETE_EXECUTABLE)
@@ -457,20 +457,20 @@
 
 			ADD_TEST( osynctool_add_event_ldif ${TESTDIR}/check_osynctool_add_ldif_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.ldif" )
 
-			#ADD_TEST( osynctool_add_todo_ldif ${TESTDIR}/check_osynctool_add_ldif_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.ldif" )
+			ADD_TEST( osynctool_add_todo_ldif ${TESTDIR}/check_osynctool_add_ldif_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.ldif" )
 
 			ADD_TEST( osynctool_add_note_ldif ${TESTDIR}/check_osynctool_add_ldif_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.ldif" )
 
 
 			ADD_TEST( osynctool_add_contact1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.xml" )
 
-			#ADD_TEST( osynctool_add_contact2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" )
+			ADD_TEST( osynctool_add_contact2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" )
 
-			#ADD_TEST( osynctool_add_event_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.xml" )
+			ADD_TEST( osynctool_add_event_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.xml" )
 
-			#ADD_TEST( osynctool_add_todo_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.xml" )
+			ADD_TEST( osynctool_add_todo_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.xml" )
 
-			#ADD_TEST( osynctool_add_note_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.xml" )
+			ADD_TEST( osynctool_add_note_xmlfile ${TESTDIR}/check_osynctool_add_file_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.xml" )
 
 
 		ENDIF (LDAPDELETE_EXECUTABLE)
@@ -481,12 +481,14 @@
 
 
 ############################
-# Now osynctool with valgrind...
+# Now osynctool under valgrind...
 IF (LDAPADD_EXECUTABLE)
 	IF (LDAPMODIFY_EXECUTABLE)
 		IF (LDAPDELETE_EXECUTABLE)
 			IF (VALGRIND_EXECUTABLE)	
 
+
+
 			#ADD_TEST( valgrind_osynctool_add_contact1_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.ldif" )
 
 			#ADD_TEST( valgrind_osynctool_add_contact2_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.ldif" )
@@ -498,6 +500,7 @@
 			#ADD_TEST( valgrind_osynctool_add_note_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.ldif" )
 
 
+
 			#ADD_TEST( valgrind_osynctool_add_contact1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.xml" )
 
 			#ADD_TEST( valgrind_osynctool_add_contact2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_sync ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" )
@@ -510,7 +513,6 @@
 				
 
 
-
 			ENDIF (VALGRIND_EXECUTABLE)
 		ENDIF (LDAPDELETE_EXECUTABLE)
 	ENDIF (LDAPMODIFY_EXECUTABLE)

Modified: plugins/ldap-sync/tests/check_add_modify_delete_and_sync
==============================================================================
--- plugins/ldap-sync/tests/check_add_modify_delete_and_sync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_add_modify_delete_and_sync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -116,6 +116,9 @@
 
 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
 

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	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_sync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -62,6 +62,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_valgrind_and_sync
==============================================================================
--- plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_valgrind_and_sync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_valgrind_and_sync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -72,6 +72,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_connect
==============================================================================
--- plugins/ldap-sync/tests/check_connect	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_connect	Tue Mar 31 20:28:44 2009	(r5495)
@@ -56,6 +56,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_fastsync
==============================================================================
--- plugins/ldap-sync/tests/check_fastsync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_fastsync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -55,6 +55,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_init
==============================================================================
--- plugins/ldap-sync/tests/check_init	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_init	Tue Mar 31 20:28:44 2009	(r5495)
@@ -59,6 +59,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_modify_and_fastsync
==============================================================================
--- plugins/ldap-sync/tests/check_modify_and_fastsync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_modify_and_fastsync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -52,6 +52,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_osyncplugin1
==============================================================================
--- plugins/ldap-sync/tests/check_osyncplugin1	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osyncplugin1	Tue Mar 31 20:28:44 2009	(r5495)
@@ -31,6 +31,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_osynctool1
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool1	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osynctool1	Tue Mar 31 20:28:44 2009	(r5495)
@@ -14,6 +14,29 @@
 fi
 
 
+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 -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
+
+
+
 $OSYNCTOOL --listplugins | grep -q "ldap-sync"
 rv=$?
 if test $rv -ne 0; then

Modified: plugins/ldap-sync/tests/check_osynctool2
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool2	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osynctool2	Tue Mar 31 20:28:44 2009	(r5495)
@@ -14,6 +14,31 @@
 fi
 
 
+
+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 -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
+
+
+
+
 $OSYNCTOOL --listformats | grep -q "ldap-evolutionperson"
 rv=$?
 if test $rv -ne 0; then

Modified: plugins/ldap-sync/tests/check_osynctool_add_file_and_sync
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool_add_file_and_sync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osynctool_add_file_and_sync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -48,6 +48,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_osynctool_add_file_and_valgrind_and_sync
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool_add_file_and_valgrind_and_sync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osynctool_add_file_and_valgrind_and_sync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -48,6 +48,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_osynctool_add_ldif_and_sync
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool_add_ldif_and_sync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osynctool_add_ldif_and_sync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -48,6 +48,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_osynctool_add_ldif_and_valgrind_and_sync
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool_add_ldif_and_valgrind_and_sync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osynctool_add_ldif_and_valgrind_and_sync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -48,6 +48,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_osynctool_common.inc
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool_common.inc	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osynctool_common.inc	Tue Mar 31 20:28:44 2009	(r5495)
@@ -648,9 +648,9 @@
 	if test "$objtype" == "contact"; then
 		remove_contact_files	
 	elif test "$objtype" == "event"; then
-		remove_event_file
+		remove_event1_file
 	elif test "$objtype" == "todo"; then
-		remove_todo_file
+		remove_todo1_file
 	elif test "$objtype" == "note"; then
 		remove_note_files
 	fi
@@ -663,6 +663,8 @@
 remove_files()
 {
 	remove_contact_files
+	remove_event1_file
+	remove_todo1_file
 	remove_note_files
 }
 
@@ -705,9 +707,9 @@
 #	if test "$objtype" == "contact"; then
 #		remove_contact_files
 #	elif test "$objtype" == "event"; then
-#		remove_event_file
+#		remove_event1_file
 #	elif test "$objtype" == "todo"; then
-#		remove_todo_file
+#		remove_todo1_file
 #	elif test "$objtype" == "note"; then
 #		remove_note_files
 #	fi

Modified: plugins/ldap-sync/tests/check_osynctool_file1
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool_file1	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_osynctool_file1	Tue Mar 31 20:28:44 2009	(r5495)
@@ -22,6 +22,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_slowsync
==============================================================================
--- plugins/ldap-sync/tests/check_slowsync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_slowsync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -58,6 +58,9 @@
 
 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
 

Modified: plugins/ldap-sync/tests/check_sync
==============================================================================
--- plugins/ldap-sync/tests/check_sync	Tue Mar 31 20:28:14 2009	(r5494)
+++ plugins/ldap-sync/tests/check_sync	Tue Mar 31 20:28:44 2009	(r5495)
@@ -59,6 +59,9 @@
 
 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