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

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

Author: dgollub
Date: Thu Mar 26 02:48:16 2009
New Revision: 5344
URL: http://www.opensync.org/changeset/5344

Log:
Fixed #994 with r5342, r5343

Tested engine_sync_read_write_stress with 10 cycles - 10 passed.
Reduced the number of stress commits in engine_sync_read_write_stress
from 1000 to 250 to "workaround" #1040

Profiling to fix #1040 will be done after 0.40

fixes #994

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

Modified: trunk/tests/CMakeLists.txt
==============================================================================
--- trunk/tests/CMakeLists.txt	Thu Mar 26 02:32:27 2009	(r5343)
+++ trunk/tests/CMakeLists.txt	Thu Mar 26 02:48:16 2009	(r5344)
@@ -146,7 +146,7 @@
 OSYNC_TESTCASE( engine engine_sync_reuse )
 OSYNC_TESTCASE_DISABLED( engine engine_sync_stress "1040" )
 OSYNC_TESTCASE( engine engine_sync_read_write )
-OSYNC_TESTCASE_DISABLED( engine engine_sync_read_write_stress "994" )
+OSYNC_TESTCASE( engine engine_sync_read_write_stress )
 OSYNC_TESTCASE( engine engine_sync_read_write_stress2 )
 
 BUILD_CHECK_TEST( engine-error engine-tests/check_engine_error.c ${TEST_TARGET_LIBRARIES} )

Modified: trunk/tests/engine-tests/check_engine.c
==============================================================================
--- trunk/tests/engine-tests/check_engine.c	Thu Mar 26 02:32:27 2009	(r5343)
+++ trunk/tests/engine-tests/check_engine.c	Thu Mar 26 02:48:16 2009	(r5344)
@@ -1612,6 +1612,8 @@
 }
 END_TEST
 
+#define COMMIT_STRESS_GROUP6 250
+
 static void get_changes6(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data)
 {
 	mock_env *env = data;
@@ -1626,7 +1628,7 @@
 	
 	OSyncError *error = NULL;
 	
-	for (i = 0; i < 1000; i++) {
+	for (i = 0; i < COMMIT_STRESS_GROUP6; i++) {
 		OSyncChange *change = osync_change_new(&error);
 		osync_assert(change != NULL);
 		osync_assert(error == NULL);
@@ -1708,7 +1710,7 @@
 	osync_assert(env->num_connect == 1);
 	osync_assert(env->num_disconnect == 1);
 	osync_assert(env->num_get_changes == 1);
-	osync_assert(env->num_commit_changes == 1000);
+	osync_assert(env->num_commit_changes == COMMIT_STRESS_GROUP6);
 	osync_assert(env->main_connect == 0);
 	osync_assert(env->main_disconnect == 0);
 	osync_assert(env->main_get_changes == 0);
@@ -1783,7 +1785,7 @@
 	return debug;
 }
 
-OSYNC_UNUSED START_TEST (engine_sync_read_write_stress)
+START_TEST (engine_sync_read_write_stress)
 {
 	char *testbed = setup_testbed("sync_setup");
 	char *formatdir = g_strdup_printf("%s/formats",  testbed);
@@ -2032,11 +2034,7 @@
 OSYNC_TESTCASE_ADD(engine_sync_stress)
 
 OSYNC_TESTCASE_ADD(engine_sync_read_write)
-/* Disabled due to randomly failing - #994
- *
-*/
 OSYNC_TESTCASE_ADD(engine_sync_read_write_stress)
-
 OSYNC_TESTCASE_ADD(engine_sync_read_write_stress2)
 
 //batch commit