Loading tests/TestFuzzing.py +1 −1 Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ class TestFuzzing(BaseTest): except socket.timeout: break self.assertResponse(500, 'FAIL\r\n') self.assertResponse([x for x in range(500, 510)], 'FAIL\r\n') def test_fuzzing(self): random.seed(42) Loading util/BaseTest.py +17 −5 Original line number Diff line number Diff line Loading @@ -15,7 +15,14 @@ class BaseTest(unittest.TestCase): def tearDown(self): self.client.close() def assertResponse(self, expectedCode, message=None): # pylint: disable=invalid-name # pylint: disable=invalid-name def assertValueListEqual(self, value, expected_list, msg=None): for expected in expected_list: if value == expected: return raise self.failureException("{} not in {}: {}".format(value, expected_list, msg)) def assertResponse(self, expected_code, message=None): # pylint: disable=invalid-name def format_message(message): if not message or isinstance(message, bytes): return message Loading @@ -25,21 +32,26 @@ class BaseTest(unittest.TestCase): return message if isinstance(expected_code, int): expected_code = [expected_code] if message: if isinstance(message, str): 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(format_message(message))) raise self.failureException("Timeout with message <{}>".format(message)) if byte == b'': raise self.failureException("No code raised, but expected {}, message <{}>".format( expectedCode, format_message(message))) expected_code, message)) response += byte.decode('ASCII') self.assertEqual(int(response[:3]), expectedCode, msg="Message <{}>".format(format_message(message))) self.assertValueListEqual(int(response[:3]), expected_code, msg="Message <{}>".format(message)) if response[3] == '-': self.assertResponse(expectedCode) self.assertResponse(expected_code) tests/TestMail.py +44 −44 File changed.Contains only whitespace changes. Show changes Loading
tests/TestFuzzing.py +1 −1 Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ class TestFuzzing(BaseTest): except socket.timeout: break self.assertResponse(500, 'FAIL\r\n') self.assertResponse([x for x in range(500, 510)], 'FAIL\r\n') def test_fuzzing(self): random.seed(42) Loading
util/BaseTest.py +17 −5 Original line number Diff line number Diff line Loading @@ -15,7 +15,14 @@ class BaseTest(unittest.TestCase): def tearDown(self): self.client.close() def assertResponse(self, expectedCode, message=None): # pylint: disable=invalid-name # pylint: disable=invalid-name def assertValueListEqual(self, value, expected_list, msg=None): for expected in expected_list: if value == expected: return raise self.failureException("{} not in {}: {}".format(value, expected_list, msg)) def assertResponse(self, expected_code, message=None): # pylint: disable=invalid-name def format_message(message): if not message or isinstance(message, bytes): return message Loading @@ -25,21 +32,26 @@ class BaseTest(unittest.TestCase): return message if isinstance(expected_code, int): expected_code = [expected_code] if message: if isinstance(message, str): 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(format_message(message))) raise self.failureException("Timeout with message <{}>".format(message)) if byte == b'': raise self.failureException("No code raised, but expected {}, message <{}>".format( expectedCode, format_message(message))) expected_code, message)) response += byte.decode('ASCII') self.assertEqual(int(response[:3]), expectedCode, msg="Message <{}>".format(format_message(message))) self.assertValueListEqual(int(response[:3]), expected_code, msg="Message <{}>".format(message)) if response[3] == '-': self.assertResponse(expectedCode) self.assertResponse(expected_code)