Loading util/BaseTest.py +7 −7 Original line number Diff line number Diff line Loading @@ -39,7 +39,7 @@ class BaseTest(unittest.TestCase): if not form_message or isinstance(form_message, bytes): return form_message if form_message[-2:] == '\r\n': message = form_message[:-2] form_message = form_message[:-2] if len(form_message) > 100: form_message = '{} ..[{}x].. {}'.format(form_message[:50], len(form_message)-100, form_message[-50:]) Loading @@ -50,20 +50,20 @@ class BaseTest(unittest.TestCase): if message: if isinstance(message, str): message = message.encode('ASCII') self.client.send(message.encode('ASCII')) else: self.client.send(message) message = format_message(message) response = '' while not response.endswith('\r\n'): try: byte = self.client.recv(1) except socket.timeout: raise self.failureException("Timeout with message <{}>".format(message)) raise self.failureException("Timeout with message <{}>".format(format_message(message))) if byte == b'': raise self.failureException("No code raised, but expected {}, message <{}>".format( expected_code, message)) expected_code, format_message(message))) response += byte.decode('ASCII') self.assertValueListEqual(int(response[:3]), expected_code, msg="Message <{}>".format(message)) self.assertValueListEqual(int(response[:3]), expected_code, msg="Message <{}>".format(format_message(message))) if response[3] == '-': self.assertResponse(expected_code) Loading
util/BaseTest.py +7 −7 Original line number Diff line number Diff line Loading @@ -39,7 +39,7 @@ class BaseTest(unittest.TestCase): if not form_message or isinstance(form_message, bytes): return form_message if form_message[-2:] == '\r\n': message = form_message[:-2] form_message = form_message[:-2] if len(form_message) > 100: form_message = '{} ..[{}x].. {}'.format(form_message[:50], len(form_message)-100, form_message[-50:]) Loading @@ -50,20 +50,20 @@ class BaseTest(unittest.TestCase): if message: if isinstance(message, str): message = message.encode('ASCII') self.client.send(message.encode('ASCII')) else: self.client.send(message) message = format_message(message) response = '' while not response.endswith('\r\n'): try: byte = self.client.recv(1) except socket.timeout: raise self.failureException("Timeout with message <{}>".format(message)) raise self.failureException("Timeout with message <{}>".format(format_message(message))) if byte == b'': raise self.failureException("No code raised, but expected {}, message <{}>".format( expected_code, message)) expected_code, format_message(message))) response += byte.decode('ASCII') self.assertValueListEqual(int(response[:3]), expected_code, msg="Message <{}>".format(message)) self.assertValueListEqual(int(response[:3]), expected_code, msg="Message <{}>".format(format_message(message))) if response[3] == '-': self.assertResponse(expected_code)