diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-11-27 18:07:56 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-12-06 16:29:04 +0000 |
| commit | 86ba1bdac4b88ae23b5f37e349afabacb840f03c (patch) | |
| tree | 9376eb83f99f62ff0e212a0216f66d55c2ffe460 | |
| parent | 2c1e66315f34380a387ea11a81c227066c38e204 (diff) | |
Tidy up privacy list test very slightly
| -rw-r--r-- | tests/twisted/presence/invisible_xep_0126.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/twisted/presence/invisible_xep_0126.py b/tests/twisted/presence/invisible_xep_0126.py index a1651408b..fd39ef855 100644 --- a/tests/twisted/presence/invisible_xep_0126.py +++ b/tests/twisted/presence/invisible_xep_0126.py @@ -8,8 +8,7 @@ XEP-0016 or XEP-0126. Some servers silently support it, like certain version of Ejabberd and all released versions of Prosody (as of 7.0). """ from gabbletest import ( - exec_test, XmppXmlStream, acknowledge_iq, send_error_reply, - disconnect_conn, elem, elem_iq + exec_test, acknowledge_iq, send_error_reply, elem, elem_iq ) from servicetest import ( EventPattern, assertEquals, assertNotEquals, assertContains, @@ -296,8 +295,7 @@ def test_privacy_list_push_conflict(q, bus, conn, stream): set_id = stream.send_privacy_list_push_iq("invisible") _, req_list = q.expect_many( - EventPattern('stream-iq', iq_type='result', predicate=lambda event: \ - event.stanza['id'] == set_id), + EventPattern('stream-iq', iq_type='result', iq_id=set_id), EventPattern('stream-iq', query_ns=ns.PRIVACY, iq_type="get")) stream.send_privacy_list(req_list.stanza, @@ -322,8 +320,7 @@ def test_privacy_list_push_valid(q, bus, conn, stream): set_id = stream.send_privacy_list_push_iq("invisible") _, req_list = q.expect_many( - EventPattern('stream-iq', iq_type='result', predicate=lambda event: \ - event.stanza['id'] == set_id), + EventPattern('stream-iq', iq_type='result', iq_id=set_id), EventPattern('stream-iq', query_ns=ns.PRIVACY, iq_type="get")) stream.send_privacy_list(req_list.stanza, |