[Opensync-commits] r5320 - in trunk/tests: . engine-tests

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

Author: dgollub
Date: Thu Mar 26 00:27:25 2009
New Revision: 5320
URL: http://www.opensync.org/changeset/5320

Log:
Fix and renable engine_error_dual_connect_error testcase.

Tolerate the "disconnect" event signal on a dual_connect_error. 

fixes #995

Modified:
   trunk/tests/CMakeLists.txt
   trunk/tests/engine-tests/check_engine_error.c

Modified: trunk/tests/CMakeLists.txt
==============================================================================
--- trunk/tests/CMakeLists.txt	Wed Mar 25 23:56:37 2009	(r5319)
+++ trunk/tests/CMakeLists.txt	Thu Mar 26 00:27:25 2009	(r5320)
@@ -154,7 +154,7 @@
 OSYNC_TESTCASE( engine-error engine_error_double_init_error)
 OSYNC_TESTCASE( engine-error engine_error_no_config_error)
 OSYNC_TESTCASE( engine-error engine_error_no_objtype_error)
-OSYNC_TESTCASE_DISABLED( engine-error engine_error_dual_connect_error "995")
+OSYNC_TESTCASE( engine-error engine_error_dual_connect_error)
 OSYNC_TESTCASE( engine-error engine_error_one_of_two_connect_error)
 OSYNC_TESTCASE( engine-error engine_error_two_of_three_connect_error)
 OSYNC_TESTCASE( engine-error engine_error_two_of_three_connect_error2)

Modified: trunk/tests/engine-tests/check_engine_error.c
==============================================================================
--- trunk/tests/engine-tests/check_engine_error.c	Wed Mar 25 23:56:37 2009	(r5319)
+++ trunk/tests/engine-tests/check_engine_error.c	Thu Mar 26 00:27:25 2009	(r5320)
@@ -509,7 +509,15 @@
 	fail_unless(num_engine_read == 0, NULL);
 	fail_unless(num_engine_written == 0, NULL);
 	fail_unless(num_engine_sync_done == 0, NULL);
-	fail_unless(num_engine_disconnected == 0, NULL);
+
+	/* Engine always disconnects - even on an error.
+	 * See _osync_engine_generate_disconnected_event()
+	 *
+	 * This is just the call of the event callback,
+	 * in theory no disconnect function of proxies get called.
+	 */
+	fail_unless(num_engine_disconnected == 1, NULL);
+
 	fail_unless(num_engine_successful == 0, NULL);
 	fail_unless(num_engine_end_conflicts == 0, NULL);
 	fail_unless(num_engine_prev_unclean == 0, NULL);