diff options
| author | George Kiagiadakis <gkiagia@tolabaki.gr> | 2016-09-01 21:19:34 +0300 |
|---|---|---|
| committer | George Kiagiadakis <gkiagia@tolabaki.gr> | 2016-09-01 21:19:34 +0300 |
| commit | 6a93bfeab23d64216cb5084f2d63c18f12ab6844 (patch) | |
| tree | 93888199ab5f65e78b73286c2cf966b5a18f4686 | |
| parent | 78d8c53b930323455bb7c4031903f46717b8a174 (diff) | |
tests: fix race condition in account-manager/avatar.py test
It seems that the order of the dbus signals is unpredictable,
so requiring it in the test sometimes makes it fail. It also
seems that the other checks above in the same unit test have
the same logic of not expecting a certain order in signal emission,
so this is probably the right thing to do.
| -rw-r--r-- | tests/twisted/account-manager/avatar.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/twisted/account-manager/avatar.py b/tests/twisted/account-manager/avatar.py index 9677e8a5..353c8992 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', |