Attachment 88292 Details for Bug 71001 – account-manager/avatar.py: fix race condition by combining expect_many calls

[patch] account-manager/avatar.py: fix race condition by combining expect_many calls

0002-account-manager-avatar.py-fix-race-condition-by-comb.patch (text/plain), 1.46 KB, created by Simon McVittie on 2013-10-29 14:19:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-29 14:19:04 UTC

Size: 1.46 KB

patch

obsolete

>From e5a6e66285ff96592ef865f865e43d110a09390a Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 29 Oct 2013 13:38:20 +0000
>Subject: [PATCH 02/12] account-manager/avatar.py: fix race condition by
> combining expect_many calls
>
>The test account-storage plugin uses GDBus, so its signals have an
>undefined order with respect to MC's dbus-glib signals. We don't
>actually care about the order anyway, so expect them all in one
>big expect_many call.
>---
> tests/twisted/account-manager/avatar.py | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
>diff --git a/tests/twisted/account-manager/avatar.py b/tests/twisted/account-manager/avatar.py
>index 8bae300..b31ab97 100644
>--- a/tests/twisted/account-manager/avatar.py
>+++ b/tests/twisted/account-manager/avatar.py
>@@ -162,10 +162,8 @@ def test(q, bus, mc):
>                 interface=cs.TEST_DBUS_ACCOUNT_PLUGIN_IFACE,
>                 signal='DeferringSetAttribute',
>                 args=[account.object_path, 'AvatarMime', '']),
>-            )
>-    q.expect('dbus-signal', path=account.object_path,
>-             interface=cs.ACCOUNT_IFACE_AVATAR, signal='AvatarChanged')
>-    q.expect_many(
>+            EventPattern('dbus-signal', path=account.object_path,
>+                interface=cs.ACCOUNT_IFACE_AVATAR, signal='AvatarChanged'),
>             EventPattern('dbus-signal',
>                 interface=cs.TEST_DBUS_ACCOUNT_PLUGIN_IFACE,
>                 signal='CommittingOne',
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 71001: 88291 | 88292

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.