[Opensync-commits] r5620 - trunk/tests/sync-tests

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

Author: friedrich.beckmann
Date: Sun Apr 19 15:12:20 2009
New Revision: 5620
URL: http://www.opensync.org/changeset/5620

Log:
Tests did not compile on windows platform

Modified:
   trunk/tests/sync-tests/check_multisync.c

Modified: trunk/tests/sync-tests/check_multisync.c
==============================================================================
--- trunk/tests/sync-tests/check_multisync.c	Sun Apr 19 13:53:18 2009	(r5619)
+++ trunk/tests/sync-tests/check_multisync.c	Sun Apr 19 15:12:20 2009	(r5620)
@@ -427,12 +427,12 @@
 	osync_hashtable_unref(table);
 }
 
-void hashtable_load_and_check(const char *testbed, int group, const char *uids[], uint num_uids)
+void hashtable_load_and_check(const char *testbed, int group, const char *uids[], unsigned int num_uids)
 {
 	char *path = g_strdup_printf("%s/configs/group/%d/hashtable.db", testbed, group);
 	OSyncHashTable *table = hashtable_load(path, "mockobjtype1", num_uids);
 	g_free(path);
-	uint i;
+	unsigned int i;
 	for (i = 0; i < num_uids; i++) {
 		check_hash(table, uids[i]);
 	}
@@ -492,7 +492,7 @@
 	fail_unless(num_change_read == 1, NULL);
 	fail_unless(num_engine_end_conflicts = 1, NULL);
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	osync_testing_system_abort("cp newdata data3/testdata");
 	
 	synchronize_once(engine, NULL);
@@ -549,7 +549,7 @@
 	fail_unless(num_change_read == 1, NULL);
 	fail_unless(num_engine_end_conflicts == 1, NULL);
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	osync_testing_system_abort("cp newdata data1/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
 	
@@ -611,7 +611,7 @@
 	fail_unless(num_change_read == 1, NULL);
 	fail_unless(num_engine_end_conflicts == 1, NULL);
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	osync_testing_system_abort("cp newdata data1/testdata");
 	osync_testing_system_abort("cp newdata data2/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
@@ -898,7 +898,7 @@
 	fail_unless(osync_testing_diff("data1", "data2"));
 	fail_unless(osync_testing_diff("data1", "data3"));
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("rm -f data1/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
@@ -965,7 +965,7 @@
 	fail_unless(osync_testing_diff("data1", "data2"));
 	fail_unless(osync_testing_diff("data1", "data3"));
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("rm -f data1/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
@@ -1010,9 +1010,9 @@
 	fail_unless(osync_testing_diff("data1", "data2"));
 	fail_unless(osync_testing_diff("data1", "data3"));
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("rm -f data1/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
@@ -1078,7 +1078,7 @@
 	fail_unless(osync_testing_diff("data1", "data2"));
 	fail_unless(osync_testing_diff("data1", "data3"));
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("rm -f data1/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
@@ -1298,7 +1298,7 @@
 	fail_unless(osync_testing_diff("data1", "data2"));
 	fail_unless(osync_testing_diff("data1", "data3"));
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("rm -f data1/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
@@ -1361,7 +1361,7 @@
 	fail_unless(osync_testing_diff("data1", "data2"));
 	fail_unless(osync_testing_diff("data1", "data3"));
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("rm -f data2/testdata");
 	osync_testing_system_abort("rm -f data3/testdata");
@@ -1419,7 +1419,7 @@
 	fail_unless(osync_testing_diff("data1", "data2"));
 	fail_unless(osync_testing_diff("data1", "data3"));
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("rm -f data2/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
@@ -1521,7 +1521,7 @@
 	
 
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	/* Should end up with 
 	   testdata(newdata) - 2 writes
@@ -1619,7 +1619,7 @@
 	fail_unless(num_change_written == 6, NULL);
 	fail_unless(num_engine_end_conflicts == 1, NULL);
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("rm -f data2/testdata");
 	osync_testing_system_abort("cp newdata data3/testdata");
@@ -1673,7 +1673,7 @@
 	fail_unless(error == NULL, NULL);
 	
 	osync_testing_system_abort("cp newdata data3/testdata1");
-	setenv("SLOW_REPORT", "2", TRUE);
+	g_setenv("SLOW_REPORT", "2", TRUE);
 	
 	synchronize_once(engine, NULL);
 
@@ -1694,7 +1694,7 @@
 	fail_unless(num_change_written == 4, NULL);
 	fail_unless(num_engine_end_conflicts == 1, NULL);
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	osync_testing_system_abort("cp newdata data3/testdata");
 
@@ -1730,7 +1730,7 @@
 	
 	check_empty(testbed);
 	
-	unsetenv("SLOW_REPORT");
+	g_unsetenv("SLOW_REPORT");
 }
 
 START_TEST (multisync_delayed_slow)
@@ -1777,7 +1777,7 @@
 	fail_unless(osync_testing_diff("data1", "data2"));
 	fail_unless(osync_testing_diff("data1", "data3"));
 	
-	sleep(2);
+	g_usleep(2*G_USEC_PER_SEC);
 	
 	/* create some conflicts and ignore them twice */