[Telepathy-commits] [telepathy-gabble/master] Update tests added in this branch to not expect TargetID to be in the future

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Aug 20 04:56:27 PDT 2008


---
 tests/twisted/text/initiate-requestotron.py |    3 +--
 tests/twisted/text/respawn.py               |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/text/initiate-requestotron.py b/tests/twisted/text/initiate-requestotron.py
index fa6ad13..9b63a6c 100644
--- a/tests/twisted/text/initiate-requestotron.py
+++ b/tests/twisted/text/initiate-requestotron.py
@@ -44,11 +44,10 @@ def test(q, bus, conn, stream):
             'TargetHandleType'] == 1
     assert emitted_props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
             foo_handle
+    assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] == jid
     assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
             'Requested'] == True
     assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
-            'TargetID'] == jid
-    assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
             'InitiatorHandle'] == self_handle
     assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
             'InitiatorID'] == 'test at localhost'
diff --git a/tests/twisted/text/respawn.py b/tests/twisted/text/respawn.py
index b219313..96d591a 100644
--- a/tests/twisted/text/respawn.py
+++ b/tests/twisted/text/respawn.py
@@ -54,11 +54,10 @@ def test(q, bus, conn, stream):
             'TargetHandleType'] == 1
     assert emitted_props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
             foo_handle
+    assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] == jid
     assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
             'Requested'] == True
     assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
-            'TargetID'] == jid
-    assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
             'InitiatorHandle'] == self_handle
     assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
             'InitiatorID'] == 'test at localhost'
-- 
1.5.6.3




More information about the Telepathy-commits mailing list