diff options
| author | David Laban <david.laban@collabora.co.uk> | 2011-01-26 14:20:17 +0000 |
|---|---|---|
| committer | David Laban <david.laban@collabora.co.uk> | 2011-01-26 17:17:54 +0000 |
| commit | 630113129f088d29aa4be60bcfbe66a3cd564a55 (patch) | |
| tree | 3e82891d9e86d6b5ab91b57095b3be6bc864781c | |
| parent | e5bf266a20d817a22c70efc31fc5d34913c1f3df (diff) | |
voip tests: BYE message needs a reply. Add to tests.
| -rw-r--r-- | tests/twisted/voip/incoming-basics.py | 6 | ||||
| -rw-r--r-- | tests/twisted/voip/outgoing-basics.py | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tests/twisted/voip/incoming-basics.py b/tests/twisted/voip/incoming-basics.py index bd0c272..0bc7c2b 100644 --- a/tests/twisted/voip/incoming-basics.py +++ b/tests/twisted/voip/incoming-basics.py @@ -151,8 +151,10 @@ def test(q, bus, conn, sip_proxy, peer='foo@bar.com'): # Connected! Blah, blah, ... # 'Nuff said - context.terminate() - q.expect('dbus-signal', signal='Closed', path=path) + bye_msg = context.terminate() + + q.expect_many(EventPattern('dbus-signal', signal='Closed', path=path), + EventPattern('sip-response', cseq=bye_msg.headers['cseq'][0])) if __name__ == '__main__': exec_test(test) diff --git a/tests/twisted/voip/outgoing-basics.py b/tests/twisted/voip/outgoing-basics.py index 297ecc8..2e90e92 100644 --- a/tests/twisted/voip/outgoing-basics.py +++ b/tests/twisted/voip/outgoing-basics.py @@ -237,13 +237,17 @@ def worker(q, bus, conn, sip_proxy, variant, peer): chan.Group.RemoveMembers([self_handle], 'closed') - mc_event, _, _ = q.expect_many( + mc_event, _, bye_event = q.expect_many( EventPattern('dbus-signal', signal='MembersChanged'), EventPattern('dbus-signal', signal='Close'), EventPattern('sip-bye', call_id=context.call_id), ) # Check that we're the actor assertEquals(self_handle, mc_event.args[5]) + + # For completeness, reply to the BYE. + bye_response = sip_proxy.responseFromRequest(200, bye_event.sip_message) + sip_proxy.deliverResponse(bye_response) def rccs(q, bus, conn, stream): """ |