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

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

Author: scriptor
Date: Mon Apr 13 23:48:19 2009
New Revision: 5598
URL: http://www.opensync.org/changeset/5598

Log:
Fixed modify_file().

Modified:
   plugins/ldap-sync/tests/check_osynctool_common.inc

Modified: plugins/ldap-sync/tests/check_osynctool_common.inc
==============================================================================
--- plugins/ldap-sync/tests/check_osynctool_common.inc	Mon Apr 13 23:48:11 2009	(r5597)
+++ plugins/ldap-sync/tests/check_osynctool_common.inc	Mon Apr 13 23:48:19 2009	(r5598)
@@ -1344,10 +1344,21 @@
 
 
 	if test "$objtype" == "contact"; then
-		diff "$CONTACT1_FILE" "$newfile"
-		echo -e "\n\n"
-		rm -f "$CONTACT1_FILE"
-		cp -f "$newfile" $CONTACT1_FILE
+		base=$(basename $xmlfile)
+
+		if test "$base" == "contact1.xml"; then
+			diff "$CONTACT1_FILE" "$newfile"
+			echo -e "\n\n"
+			rm -f "$CONTACT1_FILE"
+			cp -f "$newfile" $CONTACT1_FILE
+		elif test "$base" == "contact2.xml"; then
+			diff "$CONTACT2_FILE" "$newfile"
+			echo -e "\n\n"
+			rm -f "$CONTACT2_FILE"
+			cp -f "$newfile" $CONTACT2_FILE
+		else
+			echo -e "\n\n\n$FILE:$LINENO: ERROR: \$base = \"$base\". Exiting.\n\n\n"
+		fi
 
 	elif test "$objtype" == "event"; then
 		diff "$EVENT1_FILE" "$newfile"
@@ -1362,9 +1373,21 @@
 		cp -f "$newfile" $TODO1_FILE
 
 	elif test "$objtype" == "note"; then
-		diff "$NOTE1_FILE" "$newfile"
-		rm -f "$NOTE1_FILE"
-		cp -f "$newfile" $NOTE1_FILE
+		base=$(basename ${xmlfile})
+
+		if test "$base" == "note1.xml"; then
+			diff "$NOTE1_FILE" "$newfile"
+			rm -f "$NOTE1_FILE"
+			cp -f "$newfile" $NOTE1_FILE
+
+		elif test "$base" == "note2.xml"; then
+			diff "$NOTE2_FILE" "$newfile"
+			rm -f "$NOTE2_FILE"
+			cp -f "$newfile" $NOTE2_FILE
+		else
+			echo -e "\n\n\n$FILE:$LINENO: ERROR: \$base = \"$base\". Exiting.\n\n\n"
+			exit 1;
+		fi
 
 	fi
 }