bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eldbus: fix tests to properly take into account the presence of ecore system module. 

Ecore system module may use dbus, so when you init ecore, it may init eldbus a few
more time (depending on the module that are present on your system). This result in
eldbus_init returning a valid init, but different from 1. This patch update the test
to take that into account.
This commit is contained in:
Cedric BAIL 2013-12-23 11:42:12 +09:00
parent 0a6ce62bb2
commit c255849fdc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,9 @@ START_TEST(eldbus_test_eldbus)
int ret;
ret = eldbus_init();
fail_if(ret != 1);
fail_if(ret < 1);
ret = eldbus_shutdown();
fail_if(ret != 0);
}
END_TEST
@ -37,7 +36,7 @@ START_TEST(eldbus_test_eldbus_main_loop)
ecore_init();
ret = eldbus_init();
fail_if(ret != 1);
fail_if(ret < 1);
timer = ecore_timer_add(0.1, _quit_cb, NULL);
fail_if(timer == NULL);
@ -45,7 +44,6 @@ START_TEST(eldbus_test_eldbus_main_loop)
ecore_main_loop_begin();
ret = eldbus_shutdown();
fail_if(ret != 0);
ecore_shutdown();
@ -67,7 +65,7 @@ START_TEST(eldbus_test_eldbus_conn)
ecore_init();
ret = eldbus_init();
fail_if(ret != 1);
fail_if(ret < 1);
/*
* let's use connection type == system, so it works without a session,
@ -80,7 +78,6 @@ START_TEST(eldbus_test_eldbus_conn)
eldbus_connection_unref(conn);
ret = eldbus_shutdown();
fail_if(ret != 0);
ecore_shutdown();
@ -96,7 +93,7 @@ START_TEST(eldbus_test_eldbus_conn_object)
ecore_init();
ret = eldbus_init();
fail_if(ret != 1);
fail_if(ret < 1);
/*
* let's use connection type == system, so it works without a D-Bus session.
@ -114,7 +111,6 @@ START_TEST(eldbus_test_eldbus_conn_object)
eldbus_connection_unref(conn);
ret = eldbus_shutdown();
fail_if(ret != 0);
ecore_shutdown();