[telepathy-gabble/master] Move StreamState related tests out of the incoming condition block.

Mike Ruprecht mike.ruprecht at collabora.co.uk
Tue Dec 29 05:35:32 PST 2009


They are applicable for both incoming and outgoing.
---
 tests/twisted/jingle/call-basics.py |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/jingle/call-basics.py b/tests/twisted/jingle/call-basics.py
index a500334..f7d7d99 100644
--- a/tests/twisted/jingle/call-basics.py
+++ b/tests/twisted/jingle/call-basics.py
@@ -251,17 +251,17 @@ def run_test(jp, q, bus, conn, stream, incoming):
         "StreamState",  dbus_interface=dbus.PROPERTIES_IFACE)
     assertEquals (cs.MEDIA_STREAM_STATE_DISCONNECTED, state)
 
-    if incoming:
-        endpoint.SetStreamState (cs.MEDIA_STREAM_STATE_CONNECTED,
-            dbus_interface=cs.CALL_STREAM_ENDPOINT)
+    endpoint.SetStreamState (cs.MEDIA_STREAM_STATE_CONNECTED,
+        dbus_interface=cs.CALL_STREAM_ENDPOINT)
 
-        q.expect('dbus-signal', signal='StreamStateChanged',
-            interface=cs.CALL_STREAM_ENDPOINT)
+    q.expect('dbus-signal', signal='StreamStateChanged',
+        interface=cs.CALL_STREAM_ENDPOINT)
 
-        state = endpoint.Get (cs.CALL_STREAM_ENDPOINT,
-            "StreamState",  dbus_interface=dbus.PROPERTIES_IFACE)
-        assertEquals (cs.MEDIA_STREAM_STATE_CONNECTED, state)
+    state = endpoint.Get (cs.CALL_STREAM_ENDPOINT,
+        "StreamState",  dbus_interface=dbus.PROPERTIES_IFACE)
+    assertEquals (cs.MEDIA_STREAM_STATE_CONNECTED, state)
 
+    if incoming:
         chan.Accept (dbus_interface=cs.CHANNEL_TYPE_CALL)
         q.expect('stream-iq', predicate=jp.action_predicate('session-accept'))
     else:
-- 
1.5.6.5




More information about the telepathy-commits mailing list