From: <svn...@op...> - 2010-01-17 18:01:28
|
Author: scriptor Date: Sun Jan 17 19:01:19 2010 New Revision: 6011 URL: http://www.opensync.org/changeset/6011 Log: Fixed some smaller bugs in the test scripts. Modified: plugins/ldap-sync/tests/check_convert_from_to_many plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_valgrind_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_valgrind_and_sync Modified: plugins/ldap-sync/tests/check_convert_from_to_many ============================================================================== --- plugins/ldap-sync/tests/check_convert_from_to_many Sun Jan 17 19:01:05 2010 (r6010) +++ plugins/ldap-sync/tests/check_convert_from_to_many Sun Jan 17 19:01:19 2010 (r6011) @@ -149,7 +149,7 @@ else echo "$FILE:$LINENO: ERROR: Object type \"$OBJTYPE\" is unknown." - rv = 1 + rv=1 break; fi Modified: plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_sync ============================================================================== --- plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_sync Sun Jan 17 19:01:05 2010 (r6010) +++ plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_sync Sun Jan 17 19:01:19 2010 (r6011) @@ -125,7 +125,8 @@ fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1). Trying to remove \"$XMLFILE\"" + delete_file "$OBJECTTYPE" "$XMLFILE" exit 1; fi @@ -152,7 +153,8 @@ fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (2)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (2). Trying to remove \"$XMLFILE\"" + delete_file "$OBJECTTYPE" "$XMLFILE" exit 1; fi Modified: plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_valgrind_and_sync ============================================================================== --- plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_valgrind_and_sync Sun Jan 17 19:01:05 2010 (r6010) +++ plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_valgrind_and_sync Sun Jan 17 19:01:19 2010 (r6011) @@ -129,7 +129,8 @@ valgrind_fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1). Trying to remove \"$XMLFILE\"" + delete_file "$OBJECTTYPE" "$XMLFILE" exit 1; fi @@ -156,7 +157,8 @@ valgrind_fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (2)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (2). Trying to remove \"$XMLFILE\"" + delete_file "$OBJECTTYPE" "$XMLFILE" exit 1; fi Modified: plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_sync ============================================================================== --- plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_sync Sun Jan 17 19:01:05 2010 (r6010) +++ plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_sync Sun Jan 17 19:01:19 2010 (r6011) @@ -118,7 +118,8 @@ fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1). Trying to remove \"$LDIF\"" + run_ldapdelete "$LDIF" exit 1; fi @@ -141,7 +142,8 @@ fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (2). Trying to remove \"$LDIF\"" + run_ldapdelete "$LDIF" exit 1; fi @@ -162,7 +164,7 @@ fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (3)." exit 1; fi echo -e "\n\n\n" Modified: plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_valgrind_and_sync ============================================================================== --- plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_valgrind_and_sync Sun Jan 17 19:01:05 2010 (r6010) +++ plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_valgrind_and_sync Sun Jan 17 19:01:19 2010 (r6011) @@ -124,7 +124,8 @@ valgrind_fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1). Trying to remove \"$LDIF\"" + run_ldapdelete "$LDIF" exit 1; fi @@ -147,7 +148,8 @@ valgrind_fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (2). Trying to remove \"$LDIF\"" + run_ldapdelete "$LDIF" exit 1; fi @@ -168,7 +170,7 @@ valgrind_fast_sync rv=$? if test $rv -ne 0; then - echo "$FILE:$LINENO: ERROR: fast_sync() has failed (1)." + echo "$FILE:$LINENO: ERROR: fast_sync() has failed (3)." exit 1; fi echo -e "\n\n\n" |