framework enhancements

This commit is contained in:
Shivaram Lingamneni 2018-12-28 13:42:47 -05:00
parent 6497f97951
commit 019639ba88

View File

@ -324,13 +324,16 @@ class BaseServerTestCase(_IrcTestCase):
"""Skip to the point where we are registered """Skip to the point where we are registered
<https://tools.ietf.org/html/rfc2812#section-3.1> <https://tools.ietf.org/html/rfc2812#section-3.1>
""" """
result = []
while True: while True:
m = self.getMessage(client, synchronize=False) m = self.getMessage(client, synchronize=False)
result.append(m)
if m.command == '001': if m.command == '001':
return m return result
def connectClient(self, nick, name=None, capabilities=None, def connectClient(self, nick, name=None, capabilities=None,
skip_if_cap_nak=False): skip_if_cap_nak=False, show_io=None):
client = self.addClient(name) client = self.addClient(name, show_io=show_io)
if capabilities is not None and 0 < len(capabilities): if capabilities is not None and 0 < len(capabilities):
self.sendLine(client, 'CAP REQ :{}'.format(' '.join(capabilities))) self.sendLine(client, 'CAP REQ :{}'.format(' '.join(capabilities)))
m = self.getRegistrationMessage(client) m = self.getRegistrationMessage(client)
@ -349,7 +352,7 @@ class BaseServerTestCase(_IrcTestCase):
self.sendLine(client, 'NICK {}'.format(nick)) self.sendLine(client, 'NICK {}'.format(nick))
self.sendLine(client, 'USER username * * :Realname') self.sendLine(client, 'USER username * * :Realname')
self.skipToWelcome(client) welcome = self.skipToWelcome(client)
self.sendLine(client, 'PING foo') self.sendLine(client, 'PING foo')
# Skip all that happy welcoming stuff # Skip all that happy welcoming stuff
@ -364,6 +367,9 @@ class BaseServerTestCase(_IrcTestCase):
else: else:
(key, value) = (param, None) (key, value) = (param, None)
self.server_support[key] = value self.server_support[key] = value
welcome.append(m)
return welcome
def joinClient(self, client, channel): def joinClient(self, client, channel):
self.sendLine(client, 'JOIN {}'.format(channel)) self.sendLine(client, 'JOIN {}'.format(channel))