[telepathy-salut/master] test-caps-tubes: use check_caps from caps_helper

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Mar 30 09:55:55 PDT 2009


---
 tests/twisted/avahi/test-caps-tubes.py |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/tests/twisted/avahi/test-caps-tubes.py b/tests/twisted/avahi/test-caps-tubes.py
index b3ead9d..6529455 100644
--- a/tests/twisted/avahi/test-caps-tubes.py
+++ b/tests/twisted/avahi/test-caps-tubes.py
@@ -46,7 +46,7 @@ from xmppstream import setup_stream_listener, connect_to_stream
 import ns
 from constants import *
 
-from caps_helper import compute_caps_hash
+from caps_helper import compute_caps_hash, check_caps
 from config import PACKAGE_STRING
 
 text_fixed_properties = dbus.Dictionary({
@@ -112,21 +112,6 @@ go_allowed_properties = dbus.Array([
     'org.freedesktop.Telepathy.Channel.TargetHandle',
     ])
 
-def check_caps(txt, ver):
-    for (key, val) in { "1st": "test",
-                        "last": "suite",
-                        "status": "avail",
-                        "txtvers": "1" }.iteritems():
-        v =  txt_get_key(txt, key)
-        assert v == val, (key, val, v)
-
-    assert txt_get_key(txt, "hash") == "sha-1"
-    assert txt_get_key(txt, "node") == ns.TELEPATHY_CAPS
-
-    v = txt_get_key(txt, "ver")
-    assert v == ver, (v, ver)
-
-
 def make_presence(from_jid, type, status):
     presence = domish.Element((None, 'presence'))
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list