Update to ergo 2.15+

This commit is contained in:
Luca Matei Pintilie
2025-10-12 18:01:47 +02:00
committed by mathieui
parent d3b3242874
commit 979ba96cb0
19 changed files with 78 additions and 140 deletions
+8 -6
View File
@@ -26,12 +26,14 @@ def connection_begin(irc_host, jid, expected_irc_presence=False, fixed_irc_serve
if expected_irc_presence:
result += (expect_stanza("/presence[@from='" + irc_host + "@biboumi.localhost']"),)
if login is not None:
result += (expect_stanza("/message/body[text()='irc.localhost: You are now logged in as %s']" % (login,)),)
result += (
expect_stanza("/message/body[text()='irc.localhost: *** Looking up your hostname...']"),
expect_stanza("/message/body[text()='irc.localhost: *** Found your hostname']")
)
if login is not None:
result += (expect_stanza("/message/body[text()='irc.localhost: You are now logged in as %s']" % (login,)),)
return result
def connection_tls_begin(irc_host, jid, fixed_irc_server):
@@ -61,12 +63,12 @@ def connection_end(irc_host, jid, fixed_irc_server=False):
xpath_re = "/message[@to='" + jid + "'][@from='" + irc_host + "@biboumi.localhost']/body[re:test(text(), '%s')]"
irc_host = 'irc.localhost'
return (
expect_stanza("/message/body[re:test(text(), '%s')]" % (r'^%s: Your host is %s, running version oragono-2\.0\.0(-[a-z0-9]+)? $' % (irc_host, irc_host))),
expect_stanza("/message/body[re:test(text(), '%s')]" % (r'^%s: Your host is %s, running version ergo-2\.\d+\.\d+(-[a-z0-9]+)? $' % (irc_host, irc_host))),
expect_stanza(xpath_re % (r'^%s: This server was created .*$' % irc_host)),
expect_stanza(xpath_re % (r'^%s: There are \d+ users and \d+ invisible on \d+ server\(s\)$' % irc_host)),
expect_stanza(xpath_re % ("%s: \d+ IRC Operators online" % irc_host,)),
expect_stanza(xpath_re % ("%s: \d+ unregistered connections" % irc_host,)),
expect_stanza(xpath_re % ("%s: \d+ channels formed" % irc_host,)),
expect_stanza(xpath_re % ("%s: \\d+ IRC Operators online" % irc_host,)),
expect_stanza(xpath_re % ("%s: \\d+ unregistered connections" % irc_host,)),
expect_stanza(xpath_re % ("%s: \\d+ channels formed" % irc_host,)),
expect_stanza(xpath_re % (r'^%s: I have \d+ clients and \d+ servers$' % irc_host)),
expect_stanza(xpath_re % (r'^%s: \d+ \d+ Current local users \d+, max \d+$' % irc_host)),
expect_stanza(xpath_re % (r'^%s: \d+ \d+ Current global users \d+, max \d+$' % irc_host)),