diff options
| author | louiz’ <louiz@louiz.org> | 2016-10-17 19:49:45 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2016-10-17 19:49:45 +0200 |
| commit | 6b4d2e8e3ea6a019778624106b7a839d875152cd (patch) | |
| tree | 5c8fe29f01348cef8d6c03e842671c233bbeaafa | |
| parent | 2a0f5f1b6a92540cebb38340683a9713309a8d17 (diff) | |
| download | biboumi-6b4d2e8e3ea6a019778624106b7a839d875152cd.tar.gz biboumi-6b4d2e8e3ea6a019778624106b7a839d875152cd.tar.bz2 biboumi-6b4d2e8e3ea6a019778624106b7a839d875152cd.tar.xz biboumi-6b4d2e8e3ea6a019778624106b7a839d875152cd.zip | |
Use expect_unordered in a few more places
| -rw-r--r-- | tests/end_to_end/__main__.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py index 6942073..d04238e 100644 --- a/tests/end_to_end/__main__.py +++ b/tests/end_to_end/__main__.py @@ -707,16 +707,13 @@ if __name__ == '__main__': partial(expect_unordered, [ ("/presence[@to='{jid_one}/{resource_one}'][@from='#foo%{irc_server_one}/{nick_two}']",), - ("/presence[@to='{jid_one}/{resource_two}'][@from='#foo%{irc_server_one}/{nick_two}']",) + ("/presence[@to='{jid_one}/{resource_two}'][@from='#foo%{irc_server_one}/{nick_two}']",), + ("/presence[@to='{jid_two}/{resource_one}'][@from='#foo%{irc_server_one}/{nick_two}']", + "/presence/muc_user:x/muc_user:status[@code='110']",), + ("/presence[@to='{jid_two}/{resource_one}'][@from='#foo%{irc_server_one}/{nick_one}']",), ] ), - partial(expect_unordered, [ - ("/presence[@to='{jid_two}/{resource_one}'][@from='#foo%{irc_server_one}/{nick_one}']",), - ("/presence[@to='{jid_two}/{resource_one}'][@from='#foo%{irc_server_one}/{nick_two}']", - "/presence/muc_user:x/muc_user:status[@code='110']",), - ] - ), partial(expect_stanza, "/message[@from='#foo%{irc_server_one}'][@type='groupchat']/subject[not(text())]"), # That second user sends a private message to the first one @@ -771,8 +768,11 @@ if __name__ == '__main__': partial(send_stanza, "<message from='{jid_two}/{resource_one}' to='#foo%{irc_server_one}/{nick_three}' type='chat'><body>first</body></message>"), partial(send_stanza, "<message from='{jid_two}/{resource_one}' to='#foo%{irc_server_one}/{nick_three}' type='chat'><body>second</body></message>"), # The first user receives the two messages, on the connected resource, once each - partial(expect_stanza, "/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='first']"), - partial(expect_stanza, "/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='second']"), + + partial(expect_unordered, [ + ("/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='first']",), + ("/message[@from='{lower_nick_two}%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='chat']/body[text()='second']",), + ]), ]), Scenario("channel_messages", [ |