[Opensync-commits] r5248 - plugins/mozilla-sync/trunk/tests

[<dg...@su...>]

Author: henrik
Date: Sat Jan 31 23:13:36 2009
New Revision: 5248
URL: http://www.opensync.org/changeset/5248

Log:
Move test for OpenSync plugins from initialize_synctool (exectued for almost all cases) to blackbox_test_init_osynctool.sh which is executed ony one

Modified:
   plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in
   plugins/mozilla-sync/trunk/tests/blackbox_test_init_osynctool.sh

Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in
==============================================================================
--- plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in	Sat Jan 31 22:59:59 2009	(r5247)
+++ plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in	Sat Jan 31 23:13:36 2009	(r5248)
@@ -222,16 +222,6 @@
 	banner "Initializing osynctool"
 	${VALGRIND} osynctool --version ||
 		error_exit "Could not execute osynctool" 1
-	(${VALGRIND} osynctool --listplugins | grep "file-sync\$") ||
-		error_exit "Plugin file-sync is missing" 1
-	(${VALGRIND} osynctool --listplugins | grep "mozilla-sync\$") || 
-		error_exit "Plugin mozilla-sync is missing" 1
-	(${VALGRIND} osynctool --listformats | grep "xmlformat-contact\$") || 
-		error_exit "Format xmlformat-contact is missing" 1
-	(${VALGRIND} osynctool --listformats | grep "vcard21\$") || 
-		error_exit "Format vcard21 is missing" 1
-	(${VALGRIND} osynctool --listformats | grep "vevent20\$") || 
-		error_exit "Format vevent20 is missing" 1
 
 	# Create a temporary directory for osynctool
 	make_temp_dir CONFIG_DIR config

Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_init_osynctool.sh
==============================================================================
--- plugins/mozilla-sync/trunk/tests/blackbox_test_init_osynctool.sh	Sat Jan 31 22:59:59 2009	(r5247)
+++ plugins/mozilla-sync/trunk/tests/blackbox_test_init_osynctool.sh	Sat Jan 31 23:13:36 2009	(r5248)
@@ -17,4 +17,20 @@
 initialize_thunderbird
 initialize_osynctool
 
+echo ""
+echo "Checking for OpenSync plugins"
+(${VALGRIND} osynctool --listplugins | grep "file-sync\$") ||
+	error_exit "Plugin file-sync is missing" 1
+(${VALGRIND} osynctool --listplugins | grep "mozilla-sync\$") || 
+	error_exit "Plugin mozilla-sync is missing" 1
+
+echo ""
+echo "Checking for OpenSync formats"
+(${VALGRIND} osynctool --listformats | grep "xmlformat-contact\$") || 
+	error_exit "Format xmlformat-contact is missing" 1
+(${VALGRIND} osynctool --listformats | grep "vcard21\$") || 
+	error_exit "Format vcard21 is missing" 1
+(${VALGRIND} osynctool --listformats | grep "vevent20\$") || 
+	error_exit "Format vevent20 is missing" 1
+
 success_exit