summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-05-23 17:52:43 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-05-23 17:52:43 -0400
commita68691813914ec4d5fd5c9a39a2dba4032dca861 (patch)
tree8141e68f6d11bb75a1edc4b87b411aaa6d7cecdd
parent5f53a7699e52de5a1add721e445cee8324fe8028 (diff)
downloadefl-a68691813914ec4d5fd5c9a39a2dba4032dca861.tar.gz
tests: reduce duration of all timers in eldbus tests
these values seem to assume that network latency or some other form of delay exists in dbus communications. dbus is a local socket protocol, so such lengthy timers do nothing but waste runtime ref T6952
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_message.c22
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_object.c6
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_pending_data.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_proxy.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_signal_handler.c8
6 files changed, 22 insertions, 22 deletions
diff --git a/src/tests/eldbus/eldbus_test_eldbus_message.c b/src/tests/eldbus/eldbus_test_eldbus_message.c
index 0f1cbf993c..8900685869 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_message.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_message.c
@@ -628,7 +628,7 @@ _activable_list_get(Eldbus_Message_Cb message_cb)
Eldbus_Pending *pending = eldbus_names_activatable_list(conn, message_cb, NULL);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -745,7 +745,7 @@ EFL_START_TEST(utc_eldbus_message_info_data_get_p)
Eldbus_Pending *pending = eldbus_connection_send(conn, msg, _message_method_cb, NULL, timeout_send_ms);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -808,7 +808,7 @@ EFL_START_TEST(utc_eldbus_message_signal_new_p)
Eldbus_Pending *pending = eldbus_connection_send(conn, msg, _message_without_body_cb, NULL, timeout_send_ms);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -916,7 +916,7 @@ EFL_START_TEST(utc_eldbus_message_basic_eina_value_p)
Eldbus_Pending *pending = eldbus_name_owner_has(conn, bus, _response_owner_has_cb, NULL);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -1007,7 +1007,7 @@ EFL_START_TEST(utc_eldbus_message_arguments_vappend_p)
Eldbus_Pending *pending = eldbus_connection_send(conn, message_vparam, _message_response_cb, NULL, -1);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -1067,7 +1067,7 @@ EFL_START_TEST(utc_eldbus_message_arguments_vget_p)
Eldbus_Pending *pending = eldbus_connection_send(conn, message, _message_vget_response_cb, NULL, -1);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -1173,7 +1173,7 @@ EFL_START_TEST(utc_eldbus_message_eina_p)
pending = eldbus_proxy_call(proxy, "SwapValue", _response_swap_iter_vget, NULL, -1 , "i", value_from_client);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(2.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.15, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -1291,7 +1291,7 @@ EFL_START_TEST(utc_eldbus_message_container_p)
Eldbus_Pending *pending = eldbus_proxy_send(proxy, msg, _container_receive_cb, NULL, -1);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(2.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.15, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -1374,7 +1374,7 @@ EFL_START_TEST(utc_eldbus_message_error_new_p)
eldbus_proxy_call(proxy, "SendBool", _on_send_bool, NULL, -1, "b", NULL);
- timeout = ecore_timer_add(2.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.15, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -1526,7 +1526,7 @@ EFL_START_TEST(utc_eldbus_message_iter_fixed_array_get_p)
Eldbus_Pending *pending = eldbus_proxy_call(proxy, "SendArrayInt", _on_send_array_int, NULL, -1 , "");
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(2.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.15, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -1576,7 +1576,7 @@ EFL_START_TEST(utc_eldbus_hello_p)
eldbus_hello(conn, _hello_cb, &cb_data);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
diff --git a/src/tests/eldbus/eldbus_test_eldbus_object.c b/src/tests/eldbus/eldbus_test_eldbus_object.c
index ee92162a52..206225cec0 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_object.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_object.c
@@ -214,7 +214,7 @@ EFL_START_TEST(utc_eldbus_object_send_info_get_p)
Eldbus_Pending *pending = eldbus_object_send(obj, msg, _object_message_cb, &cb_data, -1);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -269,7 +269,7 @@ EFL_START_TEST(utc_eldbus_introspect_p)
Eldbus_Pending *pending = eldbus_object_introspect(obj, _object_message_cb, &cb_data);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.0, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -361,7 +361,7 @@ EFL_START_TEST(utc_eldbus_object_peer_p)
Eldbus_Pending *pending2 = eldbus_object_peer_ping(obj, _peer_ping_cb, &cb_data);
ck_assert_ptr_ne(NULL, pending2);
- timeout = ecore_timer_add(2.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.15, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
diff --git a/src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c b/src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c
index 7127e32a8b..f82743b1ca 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c
@@ -168,7 +168,7 @@ EFL_START_TEST(utc_eldbus_pending_info_get_cancel_p)
eldbus_pending_cancel(pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
diff --git a/src/tests/eldbus/eldbus_test_eldbus_pending_data.c b/src/tests/eldbus/eldbus_test_eldbus_pending_data.c
index d939d7427a..e10af32eb8 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_pending_data.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_pending_data.c
@@ -124,7 +124,7 @@ EFL_START_TEST(utc_eldbus_pending_data_p)
eldbus_pending_data_set(pending, pending_key_store, &pending_data_stored);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
diff --git a/src/tests/eldbus/eldbus_test_eldbus_proxy.c b/src/tests/eldbus/eldbus_test_eldbus_proxy.c
index 552609c093..f8fda91c5a 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_proxy.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_proxy.c
@@ -146,7 +146,7 @@ EFL_START_TEST(utc_eldbus_proxy_info_get_call_p)
Eldbus_Pending *pending = eldbus_proxy_call(proxy, method_name, _proxy_message_cb, &cb_data, -1, empty_string);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -219,7 +219,7 @@ EFL_START_TEST(utc_eldbus_proxy_send_call_p)
Eldbus_Pending *pending = eldbus_proxy_send(proxy, msg, _proxy_message_cb, &cb_data, -1);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
diff --git a/src/tests/eldbus/eldbus_test_eldbus_signal_handler.c b/src/tests/eldbus/eldbus_test_eldbus_signal_handler.c
index 36ebdf22f3..5e9bfc5600 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_signal_handler.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_signal_handler.c
@@ -92,7 +92,7 @@ _signal_handler_get(Eldbus_Connection *conn)
return NULL;
}
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
if (!timeout)
{
eldbus_signal_handler_unref(signal_handler);
@@ -155,7 +155,7 @@ EFL_START_TEST(utc_eldbus_signal_handler_add_p)
Eldbus_Pending *pending = eldbus_connection_send(conn, msg, _response_message_cb, NULL, -1);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -223,7 +223,7 @@ EFL_START_TEST(utc_eldbus_signal_handler_del_p)
Eldbus_Pending *pending = eldbus_connection_send(conn, msg, _response_message_cb, NULL, -1);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();
@@ -365,7 +365,7 @@ EFL_START_TEST(utc_eldbus_signal_handler_ref_unref_p)
Eldbus_Pending *pending = eldbus_connection_send(conn, msg, _response_message_cb, NULL, -1);
ck_assert_ptr_ne(NULL, pending);
- timeout = ecore_timer_add(1.5, _ecore_loop_close, NULL);
+ timeout = ecore_timer_add(0.1, _ecore_loop_close, NULL);
ck_assert_ptr_ne(NULL, timeout);
ecore_main_loop_begin();