summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Zabaluev <mikhail.zabaluev@nokia.com>2008-10-24 15:15:59 +0300
committerMikhail Zabaluev <mikhail.zabaluev@nokia.com>2008-10-24 15:15:59 +0300
commit0aaa7de9b935b4eb0310f0ed046d84888892cebf (patch)
tree89e53dad43640e9654a1039b9a435e283ca33dba
parent83fe97a0a73ea294a8ac091bba0b1a32f643281c (diff)
Message test brush-up
-rw-r--r--tests/twisted/test-message.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/twisted/test-message.py b/tests/twisted/test-message.py
index 1e194bb..6b3410b 100644
--- a/tests/twisted/test-message.py
+++ b/tests/twisted/test-message.py
@@ -6,6 +6,7 @@ from sofiatest import go, exec_test
import twisted.protocols.sip
import dbus
+import uuid
# Test message channels
@@ -64,19 +65,20 @@ def test(q, bus, conn, sip):
q.expect('dbus-signal', signal='Sent')
+ conn.ReleaseHandles(1, [handle])
+
url = twisted.protocols.sip.parseURL(self_uri)
msg = twisted.protocols.sip.Request('MESSAGE', url)
send_message(sip, prevhdr, 'Hi')
event = q.expect('dbus-signal', signal='NewChannel')
assert (event.args[1] == TEXT_TYPE and event.args[2] == 1)
+ handle = event.args[3]
# start using the new channel object
incoming_obj = bus.get_object(conn._named_service, event.args[0])
iface = dbus.Interface(incoming_obj, TEXT_TYPE)
- handle = event.args[3]
-
text_props = incoming_obj.GetAll(tp_name_prefix + '.Channel',
dbus_interface='org.freedesktop.DBus.Properties')
assert text_props['ChannelType'] == TEXT_TYPE, text_props
@@ -96,7 +98,6 @@ def test(q, bus, conn, sip):
assert not text_props['Requested'], text_props
name = conn.InspectHandles(1, [handle])[0]
-
assert name == FROM_URL
event = q.expect('dbus-signal', signal='Received')
@@ -136,7 +137,7 @@ def send_message(sip, prevhdr, body, encoding=None, sender=FROM_URL):
else:
msg.addHeader('content-type', 'text/plain; charset=%s' % encoding)
msg.addHeader('content-length', '%d' % len(msg.body))
- msg.addHeader('call-id', prevhdr['call-id'][0])
+ msg.addHeader('call-id', uuid.uuid4().hex)
via = sip.getVia()
via.branch = 'z9hG4bKXYZ'
msg.addHeader('via', via.toString())