discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b2f2823cb8da8bc29a1d3a3672fb3884992caa47
commit b2f2823cb8da8bc29a1d3a3672fb3884992caa47 Author: Mike Blumenkrantz <[email protected]> Date: Tue Jun 19 14:08:20 2018 -0400 tests: use unique dbus bus names for each eldbus test case fixture Summary: dbus bus names are unique and cannot be acquired by multiple connections simultaneously; by making this per-file unique, this part of the test can run in parallel without bus collisions ref T6848 Depends on D6201 Reviewers: stefan_schmidt, cedric, bu5hm4n, ManMower, devilhorns Reviewed By: ManMower Subscribers: ManMower, cedric, #committers Tags: #efl Maniphest Tasks: T6848 Differential Revision: https://phab.enlightenment.org/D6202 --- src/tests/eldbus/eldbus_fake_server.c | 4 ++-- src/tests/eldbus/eldbus_fake_server.h | 2 +- src/tests/eldbus/eldbus_test_eldbus_model_method.c | 6 ++++-- src/tests/eldbus/eldbus_test_eldbus_model_signal.c | 6 ++++-- src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c | 6 ++++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/tests/eldbus/eldbus_fake_server.c b/src/tests/eldbus/eldbus_fake_server.c index ee3054e910..9679e900e6 100644 --- a/src/tests/eldbus/eldbus_fake_server.c +++ b/src/tests/eldbus/eldbus_fake_server.c @@ -53,7 +53,7 @@ static const Eldbus_Service_Interface_Desc test_interface_desc = { Eldbus_Service_Interface * -fake_server_start(Fake_Server_Data *data) +fake_server_start(Fake_Server_Data *data, const char *name) { ck_assert_ptr_ne(NULL, data); @@ -62,7 +62,7 @@ fake_server_start(Fake_Server_Data *data) Eldbus_Service_Interface *interface = eldbus_service_interface_register(conn, FAKE_SERVER_PATH, &test_interface_desc); eldbus_service_object_data_set(interface, FAKE_SERVER_DATA_KEY, data); - eldbus_name_request(conn, FAKE_SERVER_BUS, ELDBUS_NAME_REQUEST_FLAG_DO_NOT_QUEUE, + eldbus_name_request(conn, name, ELDBUS_NAME_REQUEST_FLAG_DO_NOT_QUEUE, _fake_server_name_request_cb, interface); ecore_main_loop_begin(); diff --git a/src/tests/eldbus/eldbus_fake_server.h b/src/tests/eldbus/eldbus_fake_server.h index bd94519ac3..e1854d5ed2 100644 --- a/src/tests/eldbus/eldbus_fake_server.h +++ b/src/tests/eldbus/eldbus_fake_server.h @@ -23,7 +23,7 @@ struct _Fake_Server_Data int pong_response; }; -Eldbus_Service_Interface *fake_server_start(Fake_Server_Data *data); +Eldbus_Service_Interface *fake_server_start(Fake_Server_Data *data, const char *name); void fake_server_stop(Eldbus_Service_Interface *interface); #endif diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c index 84b42bf454..a04b6ca08c 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c @@ -25,11 +25,13 @@ static Eo *method = NULL; static void _setup(void) { - fake_server = fake_server_start(&fake_server_data); + char buf[1024]; + snprintf(buf, sizeof(buf), FAKE_SERVER_BUS ".%s", basename(__FILE__)); + fake_server = fake_server_start(&fake_server_data, buf); fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_connect(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE), - eldbus_model_object_bus_set(efl_added, FAKE_SERVER_BUS), + eldbus_model_object_bus_set(efl_added, buf), eldbus_model_object_path_set(efl_added, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c index c4c416d161..f896792bf6 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c @@ -23,11 +23,13 @@ static Eo *pong_signal = NULL; static void _setup(void) { - fake_server = fake_server_start(&fake_server_data); + char buf[1024]; + snprintf(buf, sizeof(buf), FAKE_SERVER_BUS ".%s", basename(__FILE__)); + fake_server = fake_server_start(&fake_server_data, buf); fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_connect(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE), - eldbus_model_object_bus_set(efl_added, FAKE_SERVER_BUS), + eldbus_model_object_bus_set(efl_added, buf), eldbus_model_object_path_set(efl_added, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c index c4bdba2bd0..0cf6adc785 100644 --- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c +++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c @@ -29,11 +29,13 @@ _setup(void) .writeonly_property = FAKE_SERVER_WRITEONLY_PROPERTY_VALUE, .readwrite_property = FAKE_SERVER_READWRITE_PROPERTY_VALUE }; - fake_server = fake_server_start(&fake_server_data); + char buf[1024]; + snprintf(buf, sizeof(buf), FAKE_SERVER_BUS ".%s", basename(__FILE__)); + fake_server = fake_server_start(&fake_server_data, buf); fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_connect(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE), - eldbus_model_object_bus_set(efl_added, FAKE_SERVER_BUS), + eldbus_model_object_bus_set(efl_added, buf), eldbus_model_object_path_set(efl_added, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); --
