[telepathy-gabble/telepathy-gabble-0.8] accept-muc-dbus-type.py: make compatible with expect_many() fix

Dafydd Harries dafydd.harries at collabora.co.uk
Mon Sep 21 09:06:59 PDT 2009


---
 tests/twisted/tubes/accept-muc-dbus-tube.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/twisted/tubes/accept-muc-dbus-tube.py b/tests/twisted/tubes/accept-muc-dbus-tube.py
index 8625c5c..17a4b6a 100644
--- a/tests/twisted/tubes/accept-muc-dbus-tube.py
+++ b/tests/twisted/tubes/accept-muc-dbus-tube.py
@@ -76,9 +76,10 @@ def test(q, bus, conn, stream, access_control):
 
     call_async(q, dbus_tube_iface, 'Accept', access_control)
 
-    return_event, names_changed, presence_event = q.expect_many(
+    return_event, names_changed1, names_changed2, presence_event = q.expect_many(
         EventPattern('dbus-return', method='Accept'),
         EventPattern('dbus-signal', signal='DBusNamesChanged', interface=cs.CHANNEL_TYPE_DBUS_TUBE),
+        EventPattern('dbus-signal', signal='DBusNamesChanged', interface=cs.CHANNEL_TYPE_DBUS_TUBE),
         EventPattern('stream-presence', to='chat at conf.localhost/test'))
 
     tube_addr = return_event.value[0]
@@ -100,7 +101,11 @@ def test(q, bus, conn, stream, access_control):
     dbus_names = tube_chan.Get(cs.CHANNEL_TYPE_DBUS_TUBE, 'DBusNames', dbus_interface=cs.PROPERTIES_IFACE)
     assertEquals({bob_handle: bob_bus_name, tubes_self_handle: self_bus_name}, dbus_names)
 
-    added, removed = names_changed.args
+    added, removed = names_changed1.args
+    assertEquals({bob_handle: bob_bus_name}, added)
+    assertEquals([], removed)
+
+    added, removed = names_changed2.args
     assertEquals({tubes_self_handle: self_bus_name}, added)
     assertEquals([], removed)
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list