Attachment 130424 Details for Bug 98191 – [1] bus dispatch tests: treat impossible message_kind as GOT_SOMETHING_ELSE

[patch] [1] bus dispatch tests: treat impossible message_kind as GOT_SOMETHING_ELSE

0001-bus-dispatch-tests-treat-impossible-message_kind-as-.patch (text/plain), 1.91 KB, created by Simon McVittie on 2017-03-24 19:42:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-03-24 19:42:01 UTC

Size: 1.91 KB

patch

obsolete

>From ec04649da69d2e68a84e31eeb3ad24d8f307f41e Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 17 Jan 2017 20:18:47 +0000
>Subject: [PATCH 01/16] bus dispatch tests: treat impossible message_kind as
> GOT_SOMETHING_ELSE
>
>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 <simon.mcvittie@collabora.co.uk>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98191
>---
> bus/dispatch.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/bus/dispatch.c b/bus/dispatch.c
>index 620fd36a..2b590741 100644
>--- a/bus/dispatch.c
>+++ b/bus/dispatch.c
>@@ -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;
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 98191: 127281 | 127282 | 127283 | 127284 | 127285 | 127286 | 129005 | 130424 | 130425 | 130426 | 130427 | 130428 | 130429 | 130430 | 130431 | 130432 | 130433 | 130434 | 130435 | 130436 | 130437 | 130438 | 130439 | 130442 | 130743

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.