telepathy-gabble: jingle/test-wait-for-caps-incomplete: don' t use jingletest
Will Thompson
wjt at kemper.freedesktop.org
Thu Dec 6 04:46:06 PST 2012
Module: telepathy-gabble
Branch: master
Commit: 240e6529fdc298cc399aa78a45947664c6f2c2dc
URL: http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=240e6529fdc298cc399aa78a45947664c6f2c2dc
Author: Will Thompson <will.thompson at collabora.co.uk>
Date: Mon Nov 26 09:34:17 2012 +0000
jingle/test-wait-for-caps-incomplete: don't use jingletest
This test didn't actually use any of the jingle protocol stuff at
allâit's just a caps test.
---
.../jingle/test-wait-for-caps-incomplete.py | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tests/twisted/jingle/test-wait-for-caps-incomplete.py b/tests/twisted/jingle/test-wait-for-caps-incomplete.py
index 389190e..e6e97c2 100644
--- a/tests/twisted/jingle/test-wait-for-caps-incomplete.py
+++ b/tests/twisted/jingle/test-wait-for-caps-incomplete.py
@@ -7,7 +7,6 @@ incomplete requests.
from functools import partial
from gabbletest import exec_test, disconnect_conn
from servicetest import make_channel_proxy, call_async, sync_dbus, EventPattern
-import jingletest
import constants as cs
@@ -18,13 +17,12 @@ if not VOIP_ENABLED:
raise SystemExit(77)
def test(q, bus, conn, stream, channel_type):
- jt = jingletest.JingleTest(stream, 'test at localhost', 'foo at bar.com/Foo')
-
+ peer = 'foo at bar.com/Foo'
# We intentionally DON'T set remote presence yet. Since Gabble is still
# unsure whether to treat contact as offline for this purpose, it
# will tentatively allow channel creation and contact handle addition
- handle = conn.RequestHandles(cs.HT_CONTACT, [jt.remote_jid])[0]
+ handle = conn.RequestHandles(cs.HT_CONTACT, [peer])[0]
if channel_type == cs.CHANNEL_TYPE_STREAMED_MEDIA:
path = conn.RequestChannel(cs.CHANNEL_TYPE_STREAMED_MEDIA,
@@ -55,7 +53,7 @@ def test(q, bus, conn, stream, channel_type):
call_async(q, conn.Requests, 'CreateChannel',
{ cs.CHANNEL_TYPE: channel_type,
cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
- cs.TARGET_ID: jt.remote_jid,
+ cs.TARGET_ID: peer,
cs.CALL_INITIAL_AUDIO: True
})
More information about the telepathy-commits
mailing list