diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-07-26 23:01:14 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-07-26 23:01:14 +0000 |
| commit | bdbab1212390d85a82d4195fa67a5c63ac0678cb (patch) | |
| tree | 25f905d227f1a703bec0d64dcb6c8916cfed5f8b /bus/dispatch.c | |
| parent | ba38a9b12ffee5d07f1e4a2a9585805695795219 (diff) | |
2007-07-26 Havoc Pennington <hp@redhat.com>
* bus/config-parser-trivial.c (check_return_values): disable a
test that hardcoded the bus user's name
* bus/dispatch.c (bus_dispatch_test_conf): remove the "if
(!use_launcher)" around the tests, they were only failing because
we didn't pass through all the expected errors from the helper.
* bus/activation-exit-codes.h
(BUS_SPAWN_EXIT_CODE_CHILD_SIGNALED): add a code for child segfaulting
(BUS_SPAWN_EXIT_CODE_GENERIC_FAILURE): make "1" be a generic
failure code, so if a third party launch helper were written it
could just always return 1 on failure.
Diffstat (limited to 'bus/dispatch.c')
| -rw-r--r-- | bus/dispatch.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index d434e808..209bde3e 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -4516,10 +4516,8 @@ bus_dispatch_test_conf (const DBusString *test_data_dir, if (!check_get_connection_unix_process_id (context, baz)) _dbus_assert_not_reached ("GetConnectionUnixProcessID message failed"); - /* Do not do the ListServices test - FIXME: the launcher does not work in this instance */ - if (!use_launcher) - if (!check_list_services (context, baz)) - _dbus_assert_not_reached ("ListActivatableNames message failed"); + if (!check_list_services (context, baz)) + _dbus_assert_not_reached ("ListActivatableNames message failed"); if (!check_no_leftovers (context)) { @@ -4536,10 +4534,8 @@ bus_dispatch_test_conf (const DBusString *test_data_dir, #ifdef DBUS_WIN_FIXME _dbus_warn("TODO: dispatch.c segfault_service_no_auto_start test\n"); #else - /* only do the segfault test if we are not using the launcher */ - if (!use_launcher) - check2_try_iterations (context, foo, "segfault_service_no_auto_start", - check_segfault_service_no_auto_start); + check2_try_iterations (context, foo, "segfault_service_no_auto_start", + check_segfault_service_no_auto_start); #endif check2_try_iterations (context, foo, "existent_service_no_auto_start", @@ -4553,9 +4549,8 @@ bus_dispatch_test_conf (const DBusString *test_data_dir, _dbus_warn("TODO: dispatch.c segfault_service_auto_start test\n"); #else /* only do the segfault test if we are not using the launcher */ - if (!use_launcher) - check2_try_iterations (context, foo, "segfault_service_auto_start", - check_segfault_service_auto_start); + check2_try_iterations (context, foo, "segfault_service_auto_start", + check_segfault_service_auto_start); #endif /* only do the shell fail test if we are not using the launcher */ @@ -4576,15 +4571,11 @@ bus_dispatch_test_conf (const DBusString *test_data_dir, check_existent_service_auto_start); #endif - /* only valid for non-launcher */ - if (!use_launcher) - if (!check_existent_service_auto_start (context, foo)) - _dbus_assert_not_reached ("existent service auto start failed"); + if (!check_existent_service_auto_start (context, foo)) + _dbus_assert_not_reached ("existent service auto start failed"); - /* only valid for non-launcher */ - if (!use_launcher) - if (!check_shell_service_success_auto_start (context, foo)) - _dbus_assert_not_reached ("shell success service auto start failed"); + if (!check_shell_service_success_auto_start (context, foo)) + _dbus_assert_not_reached ("shell success service auto start failed"); _dbus_verbose ("Disconnecting foo, bar, and baz\n"); |