From 1b72faef3c487232e519a3366db716f5a7e9226a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 24 Mar 2020 22:18:41 +0100
Subject: Update the tests to work with oragono

---
 .../complete_channel_list_with_pages_of_3.py       | 49 ++++++++--------------
 1 file changed, 18 insertions(+), 31 deletions(-)

(limited to 'tests/end_to_end/scenarios/complete_channel_list_with_pages_of_3.py')

diff --git a/tests/end_to_end/scenarios/complete_channel_list_with_pages_of_3.py b/tests/end_to_end/scenarios/complete_channel_list_with_pages_of_3.py
index 9971ccd..4c7e795 100644
--- a/tests/end_to_end/scenarios/complete_channel_list_with_pages_of_3.py
+++ b/tests/end_to_end/scenarios/complete_channel_list_with_pages_of_3.py
@@ -3,84 +3,71 @@ from scenarios import *
 scenario = (
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#aaa%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
     sequences.connection("irc.localhost", '{jid_one}/{resource_one}'),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#bbb%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#ccc%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#ddd%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#eee%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#fff%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#ggg%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#hhh%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#iii%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#jjj%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
-    expect_stanza("/message"),
     expect_stanza("/presence"),
     expect_stanza("/message"),
 
     send_stanza("<iq from='{jid_one}/{resource_one}' id='id' to='{irc_server_one}' type='get'><query xmlns='http://jabber.org/protocol/disco#items'><set xmlns='http://jabber.org/protocol/rsm'><max>3</max></set></query></iq>"),
     expect_stanza("/iq[@type='result']/disco_items:query",
-                  "/iq/disco_items:query/disco_items:item[@jid='#aaa%{irc_server_one}']",
-                  "/iq/disco_items:query/disco_items:item[@jid='#bbb%{irc_server_one}']",
-                  "/iq/disco_items:query/disco_items:item[@jid='#ccc%{irc_server_one}']",
-                  "/iq/disco_items:query/rsm:set/rsm:first[text()='#aaa%{irc_server_one}'][@index='0']",
-                  "/iq/disco_items:query/rsm:set/rsm:last[text()='#ccc%{irc_server_one}']"),
+                  "count(/iq/disco_items:query/disco_items:item[@jid])=3",
+                  "/iq/disco_items:query/rsm:set/rsm:first[@index='0']",
+                  "/iq/disco_items:query/rsm:set/rsm:last",
+                  after = save_value("last", lambda stanza: extract_text("/iq/disco_items:query/rsm:set/rsm:last", stanza))),
 
-    send_stanza("<iq from='{jid_one}/{resource_one}' id='id' to='{irc_server_one}' type='get'><query xmlns='http://jabber.org/protocol/disco#items'><set xmlns='http://jabber.org/protocol/rsm'><after>#ccc%{irc_server_one}</after><max>3</max></set></query></iq>"),
+    send_stanza("<iq from='{jid_one}/{resource_one}' id='id' to='{irc_server_one}' type='get'><query xmlns='http://jabber.org/protocol/disco#items'><set xmlns='http://jabber.org/protocol/rsm'><after>{last}</after><max>3</max></set></query></iq>"),
     expect_stanza("/iq[@type='result']/disco_items:query",
-                  "/iq/disco_items:query/disco_items:item[@jid='#ddd%{irc_server_one}']",
-                  "/iq/disco_items:query/disco_items:item[@jid='#eee%{irc_server_one}']",
-                  "/iq/disco_items:query/disco_items:item[@jid='#fff%{irc_server_one}']",
-                  "/iq/disco_items:query/rsm:set/rsm:first[text()='#ddd%{irc_server_one}'][@index='3']",
-                  "/iq/disco_items:query/rsm:set/rsm:last[text()='#fff%{irc_server_one}']"),
+                  "count(/iq/disco_items:query/disco_items:item[@jid])=3",
+                  "/iq/disco_items:query/rsm:set/rsm:first[@index='3']",
+                  "/iq/disco_items:query/rsm:set/rsm:last",
+                  after = save_value("last", lambda stanza: extract_text("/iq/disco_items:query/rsm:set/rsm:last", stanza))),
 
-    send_stanza("<iq from='{jid_one}/{resource_one}' id='id' to='{irc_server_one}' type='get'><query xmlns='http://jabber.org/protocol/disco#items'><set xmlns='http://jabber.org/protocol/rsm'><after>#fff%{irc_server_one}</after><max>3</max></set></query></iq>"),
+    send_stanza("<iq from='{jid_one}/{resource_one}' id='id' to='{irc_server_one}' type='get'><query xmlns='http://jabber.org/protocol/disco#items'><set xmlns='http://jabber.org/protocol/rsm'><after>{last}</after><max>3</max></set></query></iq>"),
     expect_stanza("/iq[@type='result']/disco_items:query",
-                  "/iq/disco_items:query/disco_items:item[@jid='#ggg%{irc_server_one}']",
-                  "/iq/disco_items:query/disco_items:item[@jid='#hhh%{irc_server_one}']",
-                  "/iq/disco_items:query/disco_items:item[@jid='#iii%{irc_server_one}']",
-                  "/iq/disco_items:query/rsm:set/rsm:first[text()='#ggg%{irc_server_one}'][@index='6']",
-                  "/iq/disco_items:query/rsm:set/rsm:last[text()='#iii%{irc_server_one}']"),
+                  "count(/iq/disco_items:query/disco_items:item[@jid])=3",
+                  "/iq/disco_items:query/rsm:set/rsm:first[@index='6']",
+                  "/iq/disco_items:query/rsm:set/rsm:last",
+                  after = save_value("last", lambda stanza: extract_text("/iq/disco_items:query/rsm:set/rsm:last", stanza))),
 
-    send_stanza("<iq from='{jid_one}/{resource_one}' id='id' to='{irc_server_one}' type='get'><query xmlns='http://jabber.org/protocol/disco#items'><set xmlns='http://jabber.org/protocol/rsm'><after>#iii%{irc_server_one}</after><max>3</max></set></query></iq>"),
+    send_stanza("<iq from='{jid_one}/{resource_one}' id='id' to='{irc_server_one}' type='get'><query xmlns='http://jabber.org/protocol/disco#items'><set xmlns='http://jabber.org/protocol/rsm'><after>{last}</after><max>3</max></set></query></iq>"),
     expect_stanza("/iq[@type='result']/disco_items:query",
-                  "/iq/disco_items:query/disco_items:item[@jid='#jjj%{irc_server_one}']",
-                  "/iq/disco_items:query/rsm:set/rsm:first[text()='#jjj%{irc_server_one}'][@index='9']",
-                  "/iq/disco_items:query/rsm:set/rsm:last[text()='#jjj%{irc_server_one}']",
+                  "count(/iq/disco_items:query/disco_items:item[@jid])=1",
+                  "/iq/disco_items:query/rsm:set/rsm:first[@index='9']",
+                  "/iq/disco_items:query/rsm:set/rsm:last",
                   "/iq/disco_items:query/rsm:set/rsm:count[text()='10']"),
 
     send_stanza("<presence from='{jid_one}/{resource_one}' to='#aaa%{irc_server_one}/{nick_one}' type='unavailable' />"),
-- 
cgit v1.2.3