[Bug 69283] tests/dbus/cm.c: un-fork test_dbus_ready() and test_dbus_fallback()

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=69283

--- Comment #3 from Simon McVittie <simon.mcvittie at collabora.co.uk> ---
Created attachment 85739
  --> https://bugs.freedesktop.org/attachment.cgi?id=85739&action=edit
[next] TpConnectionManager: retry introspection after CM exits, up  to once

Many connection managers automatically exit after 5 seconds of
inactivity. If the CM has no .manager file *and* exits in this way
while we are introspecting it, we would previously consider it to have
failed introspection - but with sufficiently unfortunate timing,
that can result in empathy-accounts not considering Haze to exist.

To avoid this, without going into an infinite loop if the CM fails to
introspect, retry once, but only once.

[This is a forward-port to Telepathy 1.0.]

---

This is commit 60120429 (Bug #67183) squashed into Attachment #85733 and
manually applied to next, to be applied on top of a cherry-pick of Attachment
#85732 (which is itself non-trivial because there is something else in the
-internal.h on next).

It also contains a couple of irrelevant patch-bands:

* cope with the protocols coming out in reversed order
* reinstate the ACTIVATE_CM test

because they were in master, and I suspect they were previously mis-merged into
next. Yay conflicts.

I'll put commit hash references in when I've committed the original.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.