summaryrefslogtreecommitdiff
path: root/src/tests/eio
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-06-20 15:31:31 +0100
committerTom Hacohen <tom@stosb.com>2016-06-20 18:02:00 +0100
commit6202cc7485a54dea6f02a2668e7c907247902dd1 (patch)
tree7a1fa2b61175b1ef75a9bff7299a0ce3daa45216 /src/tests/eio
parentd648eb5311585f7392d0290640ba133814b52589 (diff)
Adjust the code according to the eo event stop changes.
This was changed in the previous commit.
Diffstat (limited to 'src/tests/eio')
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c7
-rw-r--r--src/tests/eio/eio_test_job_xattr.c4
-rw-r--r--src/tests/eio/eio_test_sentry.c11
3 files changed, 8 insertions, 14 deletions
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 919797a184..d6c54befef 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -21,7 +21,7 @@ struct _pair
21 Eo *parent, *child; 21 Eo *parent, *child;
22}; 22};
23 23
24static Eina_Bool 24static void
25_children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event) 25_children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event)
26{ 26{
27 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); 27 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__);
@@ -39,10 +39,9 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event)
39 free(filename); 39 free(filename);
40 eina_promise_unref(promise); 40 eina_promise_unref(promise);
41 } 41 }
42 return EINA_TRUE;
43} 42}
44 43
45static Eina_Bool 44static void
46_children_added_cb(void *data EINA_UNUSED, const Eo_Event* event) 45_children_added_cb(void *data EINA_UNUSED, const Eo_Event* event)
47{ 46{
48 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); 47 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__);
@@ -61,8 +60,6 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event* event)
61 free(filename); 60 free(filename);
62 61
63 eina_promise_unref(promise); 62 eina_promise_unref(promise);
64
65 return EINA_TRUE;
66} 63}
67 64
68static void 65static void
diff --git a/src/tests/eio/eio_test_job_xattr.c b/src/tests/eio/eio_test_job_xattr.c
index f2fd2bbd24..52a988a38a 100644
--- a/src/tests/eio/eio_test_job_xattr.c
+++ b/src/tests/eio/eio_test_job_xattr.c
@@ -35,12 +35,12 @@ static const char *attr_data[] =
35 35
36int total_attributes = sizeof(attribute)/sizeof(attribute[0]); 36int total_attributes = sizeof(attribute)/sizeof(attribute[0]);
37 37
38static Eina_Bool 38static void
39_filter_cb(void *data EINA_UNUSED, const Eo_Event *event) 39_filter_cb(void *data EINA_UNUSED, const Eo_Event *event)
40{ 40{
41 Eio_Filter_Name_Data *event_info = event->info; 41 Eio_Filter_Name_Data *event_info = event->info;
42 42
43 return event_info->filter = EINA_TRUE; 43 event_info->filter = EINA_TRUE;
44} 44}
45 45
46static void 46static void
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index 4f3c6c768e..5a7247a557 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -104,11 +104,10 @@ static Eina_Bool _modify_attrib_file(void *data)
104 104
105/////// helper functions 105/////// helper functions
106 106
107static Eina_Bool _check_event_path(void *data, const Eo_Event *event) 107static void _check_event_path(void *data, const Eo_Event *event)
108{ 108{
109 Eio_Sentry_Event *event_info = event->info; 109 Eio_Sentry_Event *event_info = event->info;
110 ck_assert_str_eq((const char*)data, event_info->trigger); 110 ck_assert_str_eq((const char*)data, event_info->trigger);
111 return EINA_TRUE;
112} 111}
113 112
114static Eina_Tmpstr *_common_init() 113static Eina_Tmpstr *_common_init()
@@ -220,11 +219,9 @@ END_TEST
220 219
221static void _target_notified_cb(void *data, const Eo_Event *event) 220static void _target_notified_cb(void *data, const Eo_Event *event)
222{ 221{
223 if (_check_event_path(data, event)) 222 _check_event_path(data, event);
224 { 223 _cancel_timeout();
225 _cancel_timeout(); 224 ecore_main_loop_quit();
226 ecore_main_loop_quit();
227 }
228} 225}
229 226
230 227