Be less stupid for testing a set of commands has been sent.

This commit is contained in:
Valentin Lorentz 2015-12-21 18:01:11 +01:00
parent 10dbd84156
commit 6e4e14b9f9

View File

@ -22,24 +22,16 @@ class JoinTestCase(cases.BaseServerTestCase):
""" """
self.connectClient('foo') self.connectClient('foo')
self.sendLine(1, 'JOIN #chan') self.sendLine(1, 'JOIN #chan')
m = self.getMessage(1) received_commands = {m.command for m in self.getMessages(1)}
try: expected_commands = {
self.assertMessageEqual(m, command='JOIN', params=['#chan']) '353', # RPL_NAMREPLY
except AssertionError: '366', # RPL_ENDOFNAMES
pass }
else: self.assertTrue(expected_commands.issubset(received_commands),
m = self.getMessage(1) 'Server sent {} commands, but at least {} were expected.'
if m.command in ('331', '332'): # RPL_NOTOPIC, RPL_TOPIC .format(received_commands, expected_commands))
m = self.getMessage(1) self.assertTrue(received_commands & {'331', '332'} != set(), # RPL_NOTOPIC, RPL_TOPIC
self.assertMessageEqual(m, command='353') # RPL_NAMREPLY 'Server sent neither 331 (RPL_NOTOPIC) or 332 (RPL_TOPIC)')
m = self.getMessage(1)
self.assertMessageEqual(m, command='366') # RPL_ENDOFNAMES
else:
self.assertMessageEqual(m, command='353') # RPL_NAMREPLY
m = self.getMessage(1)
self.assertMessageEqual(m, command='366') # RPL_ENDOFNAMES
m = self.getMessage(1)
self.assertIn(m.command, ('331', '332'), m) # RPL_NOTOPIC, RPL_TOPIC
def testJoinNamreply(self): def testJoinNamreply(self):
"""“353 RPL_NAMREPLY """“353 RPL_NAMREPLY