tests: change dbus tests to use user bus (#6845)
This makes it possible to run more dbus tests in a build environment/chroot where no system bus is available. To run the dbus test one then can use dbus-run-session.
This commit is contained in:
parent
54d3be9772
commit
6349cda20f
|
@ -37,7 +37,7 @@ static int test_bus_open(void) {
|
|||
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
r = sd_bus_open_system(&bus);
|
||||
r = sd_bus_open_user(&bus);
|
||||
if (r == -ECONNREFUSED || r == -ENOENT)
|
||||
return r;
|
||||
|
||||
|
@ -51,7 +51,7 @@ static void test_bus_new_method_call(void) {
|
|||
sd_bus *bus = NULL;
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
|
||||
|
||||
assert_se(sd_bus_open_system(&bus) >= 0);
|
||||
assert_se(sd_bus_open_user(&bus) >= 0);
|
||||
|
||||
assert_se(sd_bus_message_new_method_call(bus, &m, "a.service.name", "/an/object/path", "an.interface.name", "AMethodName") >= 0);
|
||||
|
||||
|
@ -65,7 +65,7 @@ static void test_bus_new_signal(void) {
|
|||
sd_bus *bus = NULL;
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
|
||||
|
||||
assert_se(sd_bus_open_system(&bus) >= 0);
|
||||
assert_se(sd_bus_open_user(&bus) >= 0);
|
||||
|
||||
assert_se(sd_bus_message_new_signal(bus, &m, "/an/object/path", "an.interface.name", "Name") >= 0);
|
||||
|
||||
|
|
|
@ -137,7 +137,7 @@ static void test_marshal(void) {
|
|||
size_t sz;
|
||||
int r;
|
||||
|
||||
r = sd_bus_open_system(&bus);
|
||||
r = sd_bus_open_user(&bus);
|
||||
if (r < 0)
|
||||
exit(EXIT_TEST_SKIP);
|
||||
|
||||
|
|
|
@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
|
|||
double dbl;
|
||||
uint64_t u64;
|
||||
|
||||
r = sd_bus_default_system(&bus);
|
||||
r = sd_bus_default_user(&bus);
|
||||
if (r < 0)
|
||||
return EXIT_TEST_SKIP;
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ int main(int argc, char *argv[]) {
|
|||
sd_bus_slot slots[19];
|
||||
int r;
|
||||
|
||||
r = sd_bus_open_system(&bus);
|
||||
r = sd_bus_open_user(&bus);
|
||||
if (r < 0)
|
||||
return EXIT_TEST_SKIP;
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
|
|||
r = sd_event_default(&event);
|
||||
assert_se(r >= 0);
|
||||
|
||||
r = sd_bus_open_system(&a);
|
||||
r = sd_bus_open_user(&a);
|
||||
if (IN_SET(r, -ECONNREFUSED, -ENOENT)) {
|
||||
log_info("Failed to connect to bus, skipping tests.");
|
||||
return EXIT_TEST_SKIP;
|
||||
|
@ -74,7 +74,7 @@ int main(int argc, char *argv[]) {
|
|||
r = sd_bus_attach_event(a, event, SD_EVENT_PRIORITY_NORMAL);
|
||||
assert_se(r >= 0);
|
||||
|
||||
r = sd_bus_open_system(&b);
|
||||
r = sd_bus_open_user(&b);
|
||||
assert_se(r >= 0);
|
||||
|
||||
r = sd_bus_attach_event(b, event, SD_EVENT_PRIORITY_NORMAL);
|
||||
|
|
Loading…
Reference in New Issue