summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-11-16 20:03:23 +0100
committerlouiz’ <louiz@louiz.org>2016-11-16 20:03:23 +0100
commit89868e4cda7100840f967860cdebe4fe8024a427 (patch)
tree8933867dec0366ea128764be7de31b35e29bc888
parentd90f75dc60d041cb602d3af1feb7e7445dcaecf6 (diff)
downloadbiboumi-89868e4cda7100840f967860cdebe4fe8024a427.tar.gz
biboumi-89868e4cda7100840f967860cdebe4fe8024a427.tar.bz2
biboumi-89868e4cda7100840f967860cdebe4fe8024a427.tar.xz
biboumi-89868e4cda7100840f967860cdebe4fe8024a427.zip
e2e tests that the IRC server received an ident response
-rw-r--r--tests/end_to_end/__main__.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index 7658d92..442e305 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -345,7 +345,8 @@ confs = {
password=coucou
db_name=e2e_test.sqlite
port=8811
-admin=admin@example.com""",
+admin=admin@example.com
+identd_port=1113""",
'fixed_server':
"""hostname=biboumi.localhost
@@ -354,6 +355,7 @@ db_name=e2e_test.sqlite
port=8811
fixed_irc_server=irc.localhost
admin=admin@example.com
+identd_port=1113
"""}
common_replacements = {
@@ -402,11 +404,11 @@ def connection_begin_sequence(irc_host, jid):
xpath_re % (r'^%s: \*\*\* (Checking Ident|Looking up your hostname...)$' % irc_host)),
# These three messages can be received in any order
partial(expect_stanza,
- xpath_re % (r'^%s: (\*\*\* Found your hostname: .*|ACK multi-prefix|\*\*\* No Ident response)$' % irc_host)),
+ xpath_re % (r'^%s: (\*\*\* Found your hostname: .*|ACK multi-prefix|\*\*\* Got Ident response)$' % irc_host)),
partial(expect_stanza,
- xpath_re % (r'^%s: (\*\*\* Found your hostname: .*|ACK multi-prefix|\*\*\* No Ident response)$' % irc_host)),
+ xpath_re % (r'^%s: (\*\*\* Found your hostname: .*|ACK multi-prefix|\*\*\* Got Ident response)$' % irc_host)),
partial(expect_stanza,
- xpath_re % (r'^%s: (\*\*\* Found your hostname: .*|ACK multi-prefix|\*\*\* No Ident response)$' % irc_host)),
+ xpath_re % (r'^%s: (\*\*\* Found your hostname: .*|ACK multi-prefix|\*\*\* Got Ident response)$' % irc_host)),
)