From d69c41756b64e584cede931664de23f7b921e27a Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 16 Feb 2021 00:17:48 +0100 Subject: [PATCH] Fix RFC1459 tests to pass with charybdis only oragono replies to PINGs before a valid NICK afaik. --- irctest/server_tests/test_regressions.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/irctest/server_tests/test_regressions.py b/irctest/server_tests/test_regressions.py index fda7f23..db40cb9 100644 --- a/irctest/server_tests/test_regressions.py +++ b/irctest/server_tests/test_regressions.py @@ -87,12 +87,16 @@ class RegressionsTestCase(cases.BaseServerTestCase): self.addClient(1) self.sendLine(1, 'NICK *') self.sendLine(1, 'USER u s e r') - replies = set(msg.command for msg in self.getMessages(1)) + replies = {'NOTICE'} + while replies == {'NOTICE'}: + replies = set(msg.command for msg in self.getMessages(1, synchronize=False)) self.assertIn(ERR_ERRONEUSNICKNAME, replies) self.assertNotIn(RPL_WELCOME, replies) self.sendLine(1, 'NICK valid') - replies = set(msg.command for msg in self.getMessages(1)) + replies = {'NOTICE'} + while replies == {'NOTICE'}: + replies = set(msg.command for msg in self.getMessages(1, synchronize=False)) self.assertNotIn(ERR_ERRONEUSNICKNAME, replies) self.assertIn(RPL_WELCOME, replies) @@ -101,7 +105,9 @@ class RegressionsTestCase(cases.BaseServerTestCase): self.addClient(1) self.sendLine(1, 'NICK :') self.sendLine(1, 'USER u s e r') - replies = set(msg.command for msg in self.getMessages(1)) + replies = {'NOTICE'} + while replies == {'NOTICE'}: + replies = set(msg.command for msg in self.getMessages(1, synchronize=False)) self.assertNotIn(RPL_WELCOME, replies) @cases.SpecificationSelector.requiredBySpecification('RFC1459')