[next] telepathy-gabble: Be more specific about interfaces

[Simon McVittie]

Module: telepathy-gabble
Branch: next
Commit: d09a713e6d3341a44a8141d2c1d847cebd4d5466
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=d09a713e6d3341a44a8141d2c1d847cebd4d5466

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Mar 24 19:53:08 2014 +0000

Be more specific about interfaces

GDBus doesn't implement method calls with implicit interface.

---

 tests/twisted/jingle/call-muc-re-re-request.py    |    4 ++--
 tests/twisted/tubes/accept-private-stream-tube.py |    4 ++--
 tests/twisted/tubes/close-muc-with-closed-tube.py |    2 +-
 tests/twisted/tubes/ensure-si-tube.py             |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/twisted/jingle/call-muc-re-re-request.py b/tests/twisted/jingle/call-muc-re-re-request.py
index 1f72db4..b8ca58a 100644
--- a/tests/twisted/jingle/call-muc-re-re-request.py
+++ b/tests/twisted/jingle/call-muc-re-re-request.py
@@ -34,7 +34,7 @@ def run_cancel_test(q, bus, conn, stream):
         check_and_accept_offer (q, bus, conn, content, md)
 
         # Accept the channel
-        channel.Accept()
+        channel.Accept(dbus_interface=cs.CHANNEL_TYPE_CALL)
 
         def preparing(e):
             node = xpath.queryForNodes("/presence/muji/preparing", e.stanza)
@@ -52,7 +52,7 @@ def run_cancel_test(q, bus, conn, stream):
         q.expect('stream-presence', to = muc + "/test", predicate=notpreparing)
 
         if x % 2 == 0:
-            channel.Close()
+            channel.Close(dbus_interface=cs.CHANNEL)
 
 if __name__ == '__main__':
     exec_test (run_cancel_test)
diff --git a/tests/twisted/tubes/accept-private-stream-tube.py b/tests/twisted/tubes/accept-private-stream-tube.py
index 386e51b..d75b1ed 100644
--- a/tests/twisted/tubes/accept-private-stream-tube.py
+++ b/tests/twisted/tubes/accept-private-stream-tube.py
@@ -182,13 +182,13 @@ def test(q, bus, conn, stream, bytestream_cls,
     assertEquals(conn_id, e.args[0])
     assertEquals(cs.CONNECTION_REFUSED, e.args[1])
 
-    new_tube_chan.Close()
+    new_tube_chan.Close(dbus_interface=cs.CHANNEL)
 
     # Receive a tube offer from Bob
     (new_tube_chan, new_tube_iface) = \
         receive_tube_offer(q, bus, conn, stream)
     # Just close the tube
-    new_tube_chan.Close()
+    new_tube_chan.Close(dbus_interface=cs.CHANNEL)
 
     q.expect_many(
         EventPattern('dbus-signal', signal='Closed'),
diff --git a/tests/twisted/tubes/close-muc-with-closed-tube.py b/tests/twisted/tubes/close-muc-with-closed-tube.py
index 3cf23fd..9cfb0a5 100644
--- a/tests/twisted/tubes/close-muc-with-closed-tube.py
+++ b/tests/twisted/tubes/close-muc-with-closed-tube.py
@@ -118,7 +118,7 @@ def test(q, bus, conn, stream):
     q.expect('dbus-signal', signal='ChannelClosed')
 
     # close the text channel
-    text_chan.Close()
+    text_chan.Close(dbus_interface=cs.CHANNEL)
 
 if __name__ == '__main__':
     exec_test(test)
diff --git a/tests/twisted/tubes/ensure-si-tube.py b/tests/twisted/tubes/ensure-si-tube.py
index 868ec63..04cd49e 100644
--- a/tests/twisted/tubes/ensure-si-tube.py
+++ b/tests/twisted/tubes/ensure-si-tube.py
@@ -110,7 +110,7 @@ def test(q, bus, conn, stream):
 #    assert not yours
 
     chan = bus.get_object(conn.bus_name, chan_path)
-    chan.Close()
+    chan.Close(dbus_interface=cs.CHANNEL)
 
     # Now let's try ensuring a new tube.
     call_async(q, conn.Requests, 'EnsureChannel',
@@ -133,7 +133,7 @@ def test(q, bus, conn, stream):
     assert props == emitted_props, (props, emitted_props)
 
     chan = bus.get_object(conn.bus_name, path)
-    chan.Close()
+    chan.Close(dbus_interface=cs.CHANNEL)
 
 if __name__ == '__main__':
     exec_test(test, do_connect=False)