summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2010-07-11 09:57:28 (GMT)
committerWill Thompson <will.thompson@collabora.co.uk>2010-07-11 09:58:26 (GMT)
commit1477ebdcd74b1a252e6c9fe80286a49bcef41163 (patch)
treea0aaf4a1ebedc6528c42084a1a33e0d6a0ea8e2a /tests
parent808d2827e245f612f1da59cc7bb0d9e360995306 (diff)
downloadtelepathy-haze-1477ebdcd74b1a252e6c9fe80286a49bcef41163.tar.gz
telepathy-haze-1477ebdcd74b1a252e6c9fe80286a49bcef41163.tar.xz
Remove workaround for tp-glib <0.7.28.
We depend on 0.9.2 now. Plus, improve the assertion in the process.
Diffstat (limited to 'tests')
-rw-r--r--tests/twisted/connect/twice-to-same-account.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/twisted/connect/twice-to-same-account.py b/tests/twisted/connect/twice-to-same-account.py
index 1213ace..f38daac 100644
--- a/tests/twisted/connect/twice-to-same-account.py
+++ b/tests/twisted/connect/twice-to-same-account.py
@@ -7,7 +7,7 @@ shortly afterwards.
import dbus
from hazetest import exec_test
-from servicetest import tp_name_prefix, tp_path_prefix
+from servicetest import tp_name_prefix, tp_path_prefix, assertEquals
import constants as cs
def test(q, bus, conn, stream):
@@ -38,8 +38,7 @@ def test(q, bus, conn, stream):
try:
cm_iface.RequestConnection('jabber', params)
except dbus.DBusException, e:
- # tp-glib <0.7.28 got the error domain wrong! :D
- assert e.get_dbus_name().endswith("NotAvailable")
+ assertEquals(cs.NOT_AVAILABLE, e.get_dbus_name())
# but you'd be wrong: we now test that Haze is still alive.
conn.Disconnect()