enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

tests: always use session bus for eldbus tests 

Summary:
1eeb3cbdf7 causes all tests to run
inside a dbus session, so use this bus to avoid possible issues with
security policies

ref T6838
Depends on D6197

Reviewers: stefan_schmidt, cedric

Reviewed By: cedric

Subscribers: cedric, #committers

Tags: #efl

Maniphest Tasks: T6838

Differential Revision: https://phab.enlightenment.org/D6198
This commit is contained in:
Mike Blumenkrantz 2018-05-29 13:24:27 +02:00 committed by Stefan Schmidt
parent 6421dd68fd
commit 7a8076b228
7 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tests/eldbus/eldbus_test_eldbus_init.c
View File

@ -28,12 +28,7 @@ EFL_START_TEST(eldbus_test_eldbus_conn)
{
Eldbus_Connection *conn;
/*
* let's use connection type == system, so it works without a session,
* however security rules may apply differently depending on the
* machine/user
*/
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
fail_if(conn == NULL);
eldbus_connection_unref(conn);
@ -45,12 +40,7 @@ EFL_START_TEST(eldbus_test_eldbus_conn_object)
Eldbus_Connection *conn;
Eldbus_Object *obj;
/*
* let's use connection type == system, so it works without a D-Bus session.
* However security rules may apply differently depending on the
* machine/user
*/
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
fail_if(conn == NULL);
obj = eldbus_object_get(conn, "org.buu", "/org/buu");
@ -75,7 +65,7 @@ EFL_START_TEST(eldbus_test_eldbus_name_owner_changed)
Eldbus_Connection *conn;
const char *id = NULL;
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
fail_if(conn == NULL);
eldbus_name_owner_changed_callback_add(conn, "org.bus.that.not.exist",

16
src/tests/eldbus/eldbus_test_eldbus_message.c
View File

@ -622,7 +622,7 @@ _activable_list_get(Eldbus_Message_Cb message_cb)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Pending *pending = eldbus_names_activatable_list(conn, message_cb, NULL);
@ -727,7 +727,7 @@ EFL_START_TEST(utc_eldbus_message_info_data_get_p)
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Message *msg = eldbus_message_method_call_new(bus, path, interface, method_name);
@ -794,7 +794,7 @@ EFL_START_TEST(utc_eldbus_message_signal_new_p)
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Signal_Handler *signal_handler = eldbus_signal_handler_add(conn, NULL, path, interface,
@ -855,7 +855,7 @@ EFL_END_TEST
EFL_START_TEST(utc_eldbus_message_ref_unref_p)
{
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Message *msg = eldbus_message_method_call_new(bus, path, interface, method_name);
@ -910,7 +910,7 @@ EFL_START_TEST(utc_eldbus_message_basic_eina_value_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Pending *pending = eldbus_name_owner_has(conn, bus, _response_owner_has_cb, NULL);
@ -996,7 +996,7 @@ EFL_END_TEST
EFL_START_TEST(utc_eldbus_message_arguments_vappend_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
message_vparam = eldbus_message_method_call_new(bus, path, interface, "GetNameOwner");
@ -1055,7 +1055,7 @@ EFL_END_TEST
EFL_START_TEST(utc_eldbus_message_arguments_vget_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Message *message = eldbus_message_method_call_new(bus, path, interface, "NameHasOwner");
@ -1571,7 +1571,7 @@ EFL_START_TEST(utc_eldbus_hello_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
eldbus_hello(conn, _hello_cb, &cb_data);

4
src/tests/eldbus/eldbus_test_eldbus_object.c
View File

@ -188,7 +188,7 @@ EFL_START_TEST(utc_eldbus_object_send_info_get_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Object *obj = eldbus_object_get(conn, bus, path);
@ -260,7 +260,7 @@ EFL_START_TEST(utc_eldbus_introspect_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Object *obj = eldbus_object_get(conn, bus, path);

2
src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c
View File

@ -99,7 +99,7 @@ _pending_connection_get()
{
const int send_timeout_ms = 500;
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
if (!conn)
{
return NULL;

2
src/tests/eldbus/eldbus_test_eldbus_pending_data.c
View File

@ -110,7 +110,7 @@ EFL_START_TEST(utc_eldbus_pending_data_p)
const char *member = "GetId";
const int send_timeout_ms = 500;
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
obj = eldbus_object_get(conn, bus, path);

8
src/tests/eldbus/eldbus_test_eldbus_proxy.c
View File

@ -122,7 +122,7 @@ EFL_START_TEST(utc_eldbus_proxy_info_get_call_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Object *obj = eldbus_object_get(conn, bus, path);
@ -204,7 +204,7 @@ EFL_START_TEST(utc_eldbus_proxy_send_call_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Object *obj = eldbus_object_get(conn, bus, path);
@ -277,7 +277,7 @@ EFL_START_TEST(utc_eldbus_proxy_send_and_block_p)
const char *errname, *errmsg;
char *text_reply = NULL;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Object *obj = eldbus_object_get(conn, bus, path);
@ -359,7 +359,7 @@ EFL_START_TEST(utc_eldbus_proxy_data_p)
{
is_success = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Object *obj = eldbus_object_get(conn, bus, path);

10
src/tests/eldbus/eldbus_test_eldbus_signal_handler.c
View File

@ -141,7 +141,7 @@ EFL_START_TEST(utc_eldbus_signal_handler_add_p)
{
is_success_cb = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Signal_Handler *signal_handler = eldbus_signal_handler_add(conn, NULL, path, interface,
@ -207,7 +207,7 @@ EFL_START_TEST(utc_eldbus_signal_handler_del_p)
{
is_success_cb = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Signal_Handler *signal_handler = eldbus_signal_handler_add(conn, NULL, path, interface,
@ -272,7 +272,7 @@ EFL_END_TEST
*/
EFL_START_TEST(utc_eldbus_signal_handler_get_p)
{
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Signal_Handler *signal_handler = eldbus_signal_handler_add(conn, bus, path, interface,
@ -346,7 +346,7 @@ EFL_START_TEST(utc_eldbus_signal_handler_ref_unref_p)
{
is_success_cb = EINA_FALSE;
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Signal_Handler *signal_handler = eldbus_signal_handler_add(conn, NULL, path, interface,
@ -417,7 +417,7 @@ EFL_END_TEST
EFL_START_TEST(utc_eldbus_signal_handler_free_cb_add_del_p)
{
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
Eldbus_Connection *conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
ck_assert_ptr_ne(NULL, conn);
Eldbus_Signal_Handler *signal_handler = _signal_handler_get(conn);