summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2010-07-11 09:58:50 (GMT)
committerWill Thompson <will.thompson@collabora.co.uk>2010-07-11 09:58:50 (GMT)
commitc772048a95b15ae01b0d0bd80822b85f617a3b5f (patch)
treee48a20af282f43280bf7a86416d723c5e3c1b423 /tests
parent1477ebdcd74b1a252e6c9fe80286a49bcef41163 (diff)
downloadtelepathy-haze-c772048a95b15ae01b0d0bd80822b85f617a3b5f.tar.gz
telepathy-haze-c772048a95b15ae01b0d0bd80822b85f617a3b5f.tar.xz
Unrace connect/twice-to-same-account.py
Diffstat (limited to 'tests')
-rw-r--r--tests/twisted/connect/twice-to-same-account.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/twisted/connect/twice-to-same-account.py b/tests/twisted/connect/twice-to-same-account.py
index f38daac..fb2c25e 100644
--- a/tests/twisted/connect/twice-to-same-account.py
+++ b/tests/twisted/connect/twice-to-same-account.py
@@ -7,13 +7,17 @@ shortly afterwards.
import dbus
from hazetest import exec_test
-from servicetest import tp_name_prefix, tp_path_prefix, assertEquals
+from servicetest import (
+ tp_name_prefix, tp_path_prefix, assertEquals, EventPattern,
+ )
import constants as cs
def test(q, bus, conn, stream):
conn.Connect()
- q.expect('dbus-signal', signal='StatusChanged', args=[1, 1])
- q.expect('stream-authenticated')
+ q.expect_many(
+ EventPattern('dbus-signal', signal='StatusChanged', args=[1, 1]),
+ EventPattern('stream-authenticated'),
+ )
# FIXME: unlike Gabble, Haze does not signal a presence update to
# available during connect