diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 19:53:08 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 15:59:20 +0000 |
| commit | d09a713e6d3341a44a8141d2c1d847cebd4d5466 (patch) | |
| tree | 7409d68570263da84fb1b4648a899e4dc93ca159 | |
| parent | 7e829257676476536f8df37e392f210a9210a46f (diff) | |
Be more specific about interfaces
GDBus doesn't implement method calls with implicit interface.
| -rw-r--r-- | tests/twisted/jingle/call-muc-re-re-request.py | 4 | ||||
| -rw-r--r-- | tests/twisted/tubes/accept-private-stream-tube.py | 4 | ||||
| -rw-r--r-- | tests/twisted/tubes/close-muc-with-closed-tube.py | 2 | ||||
| -rw-r--r-- | 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 1f72db4c8..b8ca58a2c 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 386e51b5c..d75b1ed69 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 3cf23fdef..9cfb0a538 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 868ec63d0..04cd49e0b 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) |