From cebd42786a95c02ddce1ec8bfff01bfb37a7e467 Mon Sep 17 00:00:00 2001 From: "friedrich.beckmann" Date: Thu, 25 Dec 2008 20:04:21 +0000 Subject: [PATCH] windows port - replaced sleep with g_usleep git-svn-id: https://svn.opensync.org/trunk/trunk@4442 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e --- tests/engine-tests/check_engine_error.c | 4 ++-- tests/ipc-tests/check_ipc.c | 14 +++++++------- tests/support.c | 2 +- tests/sync-tests/check_sync.c | 10 +++++----- tests/sync-tests/check_sync_error.c | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/engine-tests/check_engine_error.c b/tests/engine-tests/check_engine_error.c index c7224c77..217809ec 100644 --- a/tests/engine-tests/check_engine_error.c +++ b/tests/engine-tests/check_engine_error.c @@ -2238,7 +2238,7 @@ START_TEST (commit_error_modify) g_setenv("COMMIT_TIMEOUT", "2", TRUE); g_setenv("COMMIT_ERROR", "4", TRUE); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); if (system("cp newdata2 data1/testdata")) abort(); @@ -2312,7 +2312,7 @@ START_TEST (commit_error_delete) g_setenv("COMMIT_TIMEOUT", "2", TRUE); g_setenv("COMMIT_ERROR", "4", TRUE); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); if (system("rm -f data1/testdata")) abort(); diff --git a/tests/ipc-tests/check_ipc.c b/tests/ipc-tests/check_ipc.c index b168bc80..0ddf98f3 100644 --- a/tests/ipc-tests/check_ipc.c +++ b/tests/ipc-tests/check_ipc.c @@ -277,7 +277,7 @@ START_TEST (ipc_payload_wait) pid_t cpid = fork(); if (cpid == 0) { //Child - sleep(1); + g_usleep(1*G_USEC_PER_SEC); osync_assert(osync_queue_connect(client_queue, OSYNC_QUEUE_RECEIVER, &error)); osync_assert(error == NULL); @@ -307,7 +307,7 @@ START_TEST (ipc_payload_wait) osync_assert(longint1 == 400000000); osync_assert(!strcmp(databuf, "this is another test string")); - sleep(1); + g_usleep(1*G_USEC_PER_SEC); OSyncMessage *reply = osync_message_new_reply(message, &error); @@ -317,7 +317,7 @@ START_TEST (ipc_payload_wait) osync_message_unref(reply); - sleep(1); + g_usleep(1*G_USEC_PER_SEC); if (osync_queue_disconnect(client_queue, &error) != TRUE || error != NULL) exit(1); @@ -332,7 +332,7 @@ START_TEST (ipc_payload_wait) } osync_message_unref(message); - sleep(1); + g_usleep(1*G_USEC_PER_SEC); if (osync_queue_disconnect(server_queue, &error) != TRUE || error != NULL) exit(1); @@ -958,7 +958,7 @@ START_TEST (ipc_error_rem2) osync_message_unref(message); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); osync_queue_disconnect(server_queue, &error); osync_assert(error == NULL); @@ -2121,7 +2121,7 @@ START_TEST (ipc_timeout) pid_t cpid = fork(); if (cpid == 0) { //Child - sleep(1); + g_usleep(1*G_USEC_PER_SEC); osync_assert(osync_queue_connect(client_queue, OSYNC_QUEUE_RECEIVER, &error)); osync_assert(error == NULL); @@ -2179,7 +2179,7 @@ START_TEST (ipc_timeout) } osync_message_unref(message); - sleep(1); + g_usleep(1*G_USEC_PER_SEC); if (osync_queue_disconnect(server_queue, &error) != TRUE || error != NULL) exit(1); diff --git a/tests/support.c b/tests/support.c index 1cd903f2..37414178 100644 --- a/tests/support.c +++ b/tests/support.c @@ -531,7 +531,7 @@ void solve_conflict(OSyncMappingEngine *mapping) OSyncChange *change = NULL; OSyncError *error = NULL; - sleep(5); + g_usleep(5*G_USEC_PER_SEC); change = osync_mapping_engine_nth_change(mapping, 0); osync_assert(osync_engine_mapping_solve(gengine, mapping, change, &error)); diff --git a/tests/sync-tests/check_sync.c b/tests/sync-tests/check_sync.c index a8be80e4..1bf13b1b 100644 --- a/tests/sync-tests/check_sync.c +++ b/tests/sync-tests/check_sync.c @@ -1130,7 +1130,7 @@ START_TEST (sync_conflict_duplicate2) osync_testing_system_abort("rm -f data1/testdata"); osync_testing_system_abort("rm -f data2/testdata-dupe"); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); osync_testing_system_abort("cp new_data1 data2/testdata"); osync_testing_system_abort("cp new_data1 comp_data"); @@ -1546,7 +1546,7 @@ START_TEST (sync_moddel) fail_unless(num_mapping_conflicts == 0, NULL); reset_counters(); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); osync_testing_system_abort("cp new_data1 data1/testdata"); osync_testing_system_abort("cp new_data2 data2/testdata"); @@ -1723,7 +1723,7 @@ START_TEST (sync_conflict_moddel) fail_unless(num_mapping_conflicts == 0, NULL); reset_counters(); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); osync_testing_system_abort("cp new_data2 data1/testdata"); osync_testing_system_abort("rm -f data2/testdata"); @@ -1901,7 +1901,7 @@ START_TEST (sync_easy_dualdel) reset_counters(); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); osync_testing_system_abort("rm -f data1/testdata"); osync_testing_system_abort("rm -f data1/testdata2"); @@ -2122,7 +2122,7 @@ START_TEST (sync_large) reset_counters(); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); //Add left create_random_file("data1/file11"); //Add right diff --git a/tests/sync-tests/check_sync_error.c b/tests/sync-tests/check_sync_error.c index 78a3c040..40e39a96 100644 --- a/tests/sync-tests/check_sync_error.c +++ b/tests/sync-tests/check_sync_error.c @@ -1197,7 +1197,7 @@ START_TEST (commit_error_modify) g_setenv("COMMIT_TIMEOUT", "2", TRUE); g_setenv("COMMIT_ERROR", "4", TRUE); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); osync_testing_system_abort("cp newdata2 data1/testdata"); @@ -1258,7 +1258,7 @@ START_TEST (commit_error_delete) g_setenv("COMMIT_TIMEOUT", "2", TRUE); g_setenv("COMMIT_ERROR", "4", TRUE); - sleep(2); + g_usleep(2*G_USEC_PER_SEC); osync_testing_system_abort("rm -f data1/testdata"); -- 2.11.4.GIT