diff --git a/src/tests/eio/eio_test_monitor.c b/src/tests/eio/eio_test_monitor.c index ce51d8f97f..0e774dfe0b 100644 --- a/src/tests/eio/eio_test_monitor.c +++ b/src/tests/eio/eio_test_monitor.c @@ -14,8 +14,8 @@ /////////////////timeout function -#define TEST_TIMEOUT_SEC 10 -#define TEST_OPERATION_DELAY 0.5 +#define TEST_TIMEOUT_SEC 0.5 +#define TEST_OPERATION_DELAY 0.01 static Ecore_Timer *test_timeout_timer; @@ -106,7 +106,10 @@ static Eina_Bool _modify_attrib_file(void *data) static Eina_Bool _check_event_path(void *data, void *event) { - ck_assert_str_eq((const char*)data, ((Eio_Monitor_Event*)event)->filename); + const char *f = ((Eio_Monitor_Event*)event)->filename; + /* ignore directory creation events */ + if (ecore_file_is_dir(f)) return ECORE_CALLBACK_RENEW; + ck_assert_str_eq((const char*)data, f); return EINA_TRUE; } @@ -142,14 +145,9 @@ EFL_START_TEST(eio_test_monitor_add_and_remove) filename = eina_stringshare_printf("%s/eio_test_monitor_add_and_remove", dirname); _create_directory((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory monitor = eio_monitor_add(filename); - usleep(500000); - eio_monitor_del(monitor); _common_shutdown(dirname); @@ -166,15 +164,10 @@ EFL_START_TEST(eio_test_monitor_add_remove_add) filename = eina_stringshare_printf("%s/eio_test_monitor_add_remove_add", dirname); _create_directory((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory monitor1 = eio_monitor_add(filename); eio_monitor_del(monitor1); - usleep(500000); - monitor2 = eio_monitor_add(filename); eio_monitor_del(monitor2); @@ -195,13 +188,10 @@ EFL_START_TEST(eio_test_monitor_add_add_remove_remove) _create_directory((void*)filename1); _create_directory((void*)filename2); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory monitor1 = eio_monitor_add(filename1); monitor2 = eio_monitor_add(filename2); - usleep(500000); + eio_monitor_del(monitor2); eio_monitor_del(monitor1); @@ -227,9 +217,6 @@ EFL_START_TEST(eio_test_monitor_directory_file_created_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_directory_file_created_notify", dirname); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_FILE_CREATED, (Ecore_Event_Handler_Cb)_file_created_cb, filename); @@ -284,9 +271,6 @@ EFL_START_TEST(eio_test_monitor_directory_multi_file_created_notify) multi_files[1].s = eina_stringshare_printf("%s/eio_test_monitor_directory_m2file_created_notify", dirname); multi_files[2].s = eina_stringshare_printf("%s/eio_test_monitor_directory_m3file_created_notify", dirname); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_FILE_CREATED, (Ecore_Event_Handler_Cb)_multi_file_created_cb, NULL); @@ -319,9 +303,6 @@ EFL_START_TEST(eio_test_monitor_directory_file_deleted_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_directory_file_deleted_notify", dirname); _create_file((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_FILE_DELETED, (Ecore_Event_Handler_Cb)_file_deleted_cb, filename); @@ -352,9 +333,6 @@ EFL_START_TEST(eio_test_monitor_directory_file_modified_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_directory_file_modified_notify", dirname); _create_file((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_FILE_MODIFIED, (Ecore_Event_Handler_Cb)_file_modified_cb, filename); @@ -386,9 +364,6 @@ EFL_START_TEST(eio_test_monitor_directory_file_closed_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_directory_file_closed_notify", dirname); _create_file((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_FILE_CLOSED, (Ecore_Event_Handler_Cb)_file_closed_cb, filename); @@ -417,9 +392,6 @@ EFL_START_TEST(eio_test_monitor_directory_directory_created_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_directory_directory_created_notify", dirname); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_DIRECTORY_CREATED, (Ecore_Event_Handler_Cb)_directory_created_cb, filename); @@ -450,9 +422,6 @@ EFL_START_TEST(eio_test_monitor_directory_directory_deleted_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_directory_directory_deleted_notify", dirname); _create_directory((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_DIRECTORY_DELETED, (Ecore_Event_Handler_Cb)_directory_deleted_cb, filename); @@ -484,9 +453,6 @@ EFL_START_TEST(eio_test_monitor_directory_directory_modified_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_directory_directory_modified_notify", dirname); _create_directory((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_DIRECTORY_MODIFIED, (Ecore_Event_Handler_Cb)_directory_modified_cb, filename); @@ -515,9 +481,6 @@ EFL_START_TEST(eio_test_monitor_directory_directory_self_deleted_notify) { Eina_Tmpstr *dirname = _common_init(); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_SELF_DELETED, (Ecore_Event_Handler_Cb)_directory_self_deleted_cb, dirname); @@ -540,9 +503,6 @@ EFL_START_TEST(eio_test_monitor_file_file_modified_notify) filename = eina_stringshare_printf("%s/filecreated", dirname); _create_file((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file eio_monitor_add(filename); ecore_event_handler_add(EIO_MONITOR_FILE_MODIFIED, (Ecore_Event_Handler_Cb)_file_modified_cb, filename); @@ -564,9 +524,6 @@ EFL_START_TEST(eio_test_monitor_file_file_attrib_modified_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_file_file_attrib_modified_notify", dirname); _create_file((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file eio_monitor_add(filename); ecore_event_handler_add(EIO_MONITOR_FILE_MODIFIED, (Ecore_Event_Handler_Cb)_file_modified_cb, filename); @@ -588,9 +545,6 @@ EFL_START_TEST(eio_test_monitor_file_file_closed_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_file_file_closed_notify", dirname); _create_file((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file eio_monitor_add(dirname); ecore_event_handler_add(EIO_MONITOR_FILE_CLOSED, (Ecore_Event_Handler_Cb)_file_closed_cb, filename); @@ -610,9 +564,6 @@ EFL_START_TEST(eio_test_monitor_file_file_self_deleted_notify) filename = eina_stringshare_printf("%s/eio_test_monitor_file_file_self_deleted_notify", dirname); _create_file((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file eio_monitor_add(filename); ecore_event_handler_add(EIO_MONITOR_SELF_DELETED, (Ecore_Event_Handler_Cb)_directory_self_deleted_cb, filename); @@ -635,9 +586,6 @@ EFL_START_TEST(eio_test_monitor_two_monitors_one_event) eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); filename = eina_stringshare_printf("%s/eio_test_monitor_two_monitors_one_event", dirname); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory eio_monitor_add(dirname); eio_monitor_add(dirname2); @@ -665,9 +613,6 @@ EFL_START_TEST(eio_test_monitor_two_monitors_one_removed_one_event) eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); filename = eina_stringshare_printf("%s/eio_test_monitor_two_monitors_one_removed", dirname); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory monitor = eio_monitor_add(dirname2); eio_monitor_add(dirname); @@ -700,9 +645,6 @@ EFL_START_TEST(eio_test_monitor_two_monitors_one_removed_no_event) eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); filename = eina_stringshare_printf("%s/eio_test_monitor_two_monitors_one_removed", dirname); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory monitor = eio_monitor_add(dirname); eio_monitor_add(dirname2); @@ -710,7 +652,7 @@ EFL_START_TEST(eio_test_monitor_two_monitors_one_removed_no_event) ecore_event_handler_add(EIO_MONITOR_FILE_CREATED, (Ecore_Event_Handler_Cb)_unexpected_event_cb, filename); ecore_timer_add(TEST_OPERATION_DELAY, _create_file, filename); - ecore_timer_add(TEST_TIMEOUT_SEC - 1, _test_timeout_expected, NULL); + ecore_timer_add(0.2, _test_timeout_expected, NULL); ecore_main_loop_begin(); @@ -730,9 +672,6 @@ EFL_START_TEST(eio_test_monitor_two_files_in_same_directory) _create_file((void*)filename); _create_file((void*)filename2); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file eio_monitor_add(filename); eio_monitor_add(filename2); @@ -760,9 +699,6 @@ EFL_START_TEST(eio_test_monitor_two_files_in_same_directory_one_removed) _create_file((void*)filename); _create_file((void*)filename2); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file monitor = eio_monitor_add(filename); eio_monitor_add(filename2); @@ -771,7 +707,7 @@ EFL_START_TEST(eio_test_monitor_two_files_in_same_directory_one_removed) ecore_event_handler_add(EIO_MONITOR_FILE_MODIFIED, (Ecore_Event_Handler_Cb)_unexpected_event_cb, filename); ecore_timer_add(TEST_OPERATION_DELAY, _modify_file, filename); - ecore_timer_add(TEST_TIMEOUT_SEC - 1, _test_timeout_expected, NULL); + ecore_timer_add(0.2, _test_timeout_expected, NULL); ecore_main_loop_begin(); diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c index f76d2824f5..d2a368438c 100644 --- a/src/tests/eio/eio_test_sentry.c +++ b/src/tests/eio/eio_test_sentry.c @@ -14,8 +14,8 @@ /////////////////timeout function -#define TEST_TIMEOUT_SEC 10 -#define TEST_OPERATION_DELAY 0.5 +#define TEST_TIMEOUT_SEC 0.5 +#define TEST_OPERATION_DELAY 0.01 static Ecore_Timer *test_timeout_timer; @@ -107,6 +107,8 @@ static Eina_Bool _modify_attrib_file(void *data) static void _check_event_path(void *data, const Efl_Event *event) { Eio_Sentry_Event *event_info = event->info; + /* ignore directory creation events */ + if (ecore_file_is_dir(event_info->trigger)) return; ck_assert_str_eq((const char*)data, event_info->trigger); } @@ -142,15 +144,10 @@ EFL_START_TEST(eio_test_sentry_add_and_remove) filename = eina_stringshare_printf("%s/eio_test_sentry_add_and_remove", dirname); _create_directory((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); fail_if(!eio_sentry_add(sentry, filename)); - usleep(500000); - eio_sentry_remove(sentry, filename); efl_unref(sentry); @@ -168,16 +165,11 @@ EFL_START_TEST(eio_test_sentry_add_remove_add) filename = eina_stringshare_printf("%s/eio_test_sentry_add_remove_add", dirname); _create_directory((void*)filename); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); fail_if(!eio_sentry_add(sentry, filename)); eio_sentry_remove(sentry, filename); - usleep(500000); - fail_if(!eio_sentry_add(sentry, filename)); eio_sentry_remove(sentry, filename); @@ -199,15 +191,12 @@ EFL_START_TEST(eio_test_sentry_add_add_remove_remove) _create_directory((void*)filename1); _create_directory((void*)filename2); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); //monitor directory fail_if(!eio_sentry_add(sentry, filename1)); fail_if(!eio_sentry_add(sentry, filename2)); - usleep(500000); + eio_sentry_remove(sentry, filename1); eio_sentry_remove(sentry, filename2); @@ -234,9 +223,6 @@ EFL_START_TEST(eio_test_sentry_directory_file_created_notify) filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -261,9 +247,6 @@ EFL_START_TEST(eio_test_sentry_directory_file_deleted_notify) _create_file((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_DELETED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -288,9 +271,6 @@ EFL_START_TEST(eio_test_sentry_directory_file_modified_notify) _create_file((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_MODIFIED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -316,9 +296,6 @@ EFL_START_TEST(eio_test_sentry_directory_file_closed_notify) _create_file((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CLOSED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -341,9 +318,6 @@ EFL_START_TEST(eio_test_sentry_directory_directory_created_notify) filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_DIRECTORY_CREATED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -368,9 +342,6 @@ EFL_START_TEST(eio_test_sentry_directory_directory_deleted_notify) _create_directory((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_DIRECTORY_DELETED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -395,9 +366,6 @@ EFL_START_TEST(eio_test_sentry_directory_directory_modified_notify) _create_directory((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_DIRECTORY_MODIFIED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -417,9 +385,6 @@ EFL_START_TEST(eio_test_sentry_directory_directory_self_deleted_notify) Eina_Tmpstr *dirname = _common_init(); Eo *sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_SELF_DELETED, (Efl_Event_Cb)_target_notified_cb, dirname); @@ -446,9 +411,6 @@ EFL_START_TEST(eio_test_sentry_file_file_modified_notify) _create_file((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file fail_if(!eio_sentry_add(sentry, filename)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_MODIFIED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -474,9 +436,6 @@ EFL_START_TEST(eio_test_sentry_file_file_attrib_modified_notify) _create_file((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file fail_if(!eio_sentry_add(sentry, filename)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_MODIFIED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -502,9 +461,6 @@ EFL_START_TEST(eio_test_sentry_file_file_closed_notify) _create_file((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file fail_if(!eio_sentry_add(sentry, dirname)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CLOSED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -528,9 +484,6 @@ EFL_START_TEST(eio_test_sentry_file_file_self_deleted_notify) _create_file((void*)filename); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file fail_if(!eio_sentry_add(sentry, filename)); efl_event_callback_add(sentry, EIO_SENTRY_EVENT_SELF_DELETED, (Efl_Event_Cb)_target_notified_cb, filename); @@ -557,9 +510,6 @@ EFL_START_TEST(eio_test_sentry_two_monitors_one_event) filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); fail_if(!eio_sentry_add(sentry, dirname2)); @@ -589,9 +539,6 @@ EFL_START_TEST(eio_test_sentry_two_monitors_one_removed_one_event) filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname2)); fail_if(!eio_sentry_add(sentry, dirname)); @@ -626,9 +573,6 @@ EFL_START_TEST(eio_test_sentry_two_monitors_one_removed_no_event) filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor directory fail_if(!eio_sentry_add(sentry, dirname)); fail_if(!eio_sentry_add(sentry, dirname2)); @@ -636,7 +580,7 @@ EFL_START_TEST(eio_test_sentry_two_monitors_one_removed_no_event) efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)_unexpected_event_cb, filename); ecore_timer_add(TEST_OPERATION_DELAY, _create_file, filename); - ecore_timer_add(TEST_TIMEOUT_SEC - 1, _test_timeout_expected, NULL); + ecore_timer_add(0.2, _test_timeout_expected, NULL); ecore_main_loop_begin(); @@ -660,9 +604,6 @@ EFL_START_TEST(eio_test_sentry_two_files_in_same_directory) _create_file((void*)filename2); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file fail_if(!eio_sentry_add(sentry,filename)); fail_if(!eio_sentry_add(sentry,filename2)); @@ -693,9 +634,6 @@ EFL_START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed) _create_file((void*)filename2); sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); - //sleep to avoid catching event generated by above manipulations - usleep(500000); - //monitor file fail_if(!eio_sentry_add(sentry,filename)); fail_if(!eio_sentry_add(sentry,filename2)); @@ -704,7 +642,7 @@ EFL_START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed) efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_MODIFIED, (Efl_Event_Cb)_unexpected_event_cb, filename); ecore_timer_add(TEST_OPERATION_DELAY, _modify_file, filename); - ecore_timer_add(TEST_TIMEOUT_SEC - 1, _test_timeout_expected, NULL); + ecore_timer_add(0.2, _test_timeout_expected, NULL); ecore_main_loop_begin();