fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-05 12:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bus dispatch tests: treat impossible message_kind as GOT_SOMETHING_ELSE

Browse source 
check_got_service_info() can't actually return an invalid
GotServiceInfo, but if it somehow does, we want to fail the test.
GOT_SOMETHING_ELSE already has that effect, and a similar meaning.

Based on a patch from Thomas Zimmermann.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98191
This commit is contained in:
Simon McVittie 2017-01-17 20:18:47 +00:00 • committed by Simon McVittie
parent eb56619aed
commit 90a1bbecf2
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bus/dispatch.c
View file

@ -2875,6 +2875,7 @@ check_existent_service_no_auto_start (BusContext *context,
switch (message_kind)
{
case GOT_SOMETHING_ELSE:
default:
_dbus_warn ("Unexpected message after ActivateService "
"(should be an error or a service announcement");
goto out;
@ -3550,6 +3551,7 @@ check_existent_service_auto_start (BusContext *context,
case GOT_ERROR:
case GOT_SOMETHING_ELSE:
default:
_dbus_warn ("Unexpected message after auto activation");
goto out;
}
@ -4243,6 +4245,7 @@ check_shell_service_success_auto_start (BusContext *context,
case GOT_ERROR:
case GOT_SOMETHING_ELSE:
default:
_dbus_warn ("Unexpected message after auto activation");
goto out;
}
@ -4671,6 +4674,7 @@ check_list_services (BusContext *context,
case GOT_SOMETHING_ELSE:
case GOT_ERROR:
case GOT_SERVICE_DELETED:
default:
_dbus_warn ("Unexpected message after ActivateService "
"(should be an error or a service announcement)");
goto out;