From 829be8413b96073d846cbf42aa8122d7c82e5058 Mon Sep 17 00:00:00 2001 From: Balakrishnan Balasubramanian Date: Mon, 1 Apr 2024 11:14:20 -0400 Subject: [PATCH] black format test files too --- Makefile | 2 +- tests/test_config.py | 9 +++++---- tests/test_pop.py | 40 +++++++++++++++++++++------------------- tests/test_pwhash.py | 26 +++++++++++++++----------- tests/test_smtp.py | 14 ++++++++------ 5 files changed, 50 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index aedf7e9..1a749c8 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ requirements.txt: Pipfile.lock pipenv requirements > requirements.txt format: - black mail4one/*py + black mail4one/*py tests/*py build-dev: requirements.txt build diff --git a/tests/test_config.py b/tests/test_config.py index c9deb4a..fa79fd4 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -67,10 +67,11 @@ class TestConfig(unittest.TestCase): def test_get_mboxes(self) -> None: cfg = config.Config(TEST_CONFIG) rules = config.parse_checkers(cfg) - self.assertEqual(config.get_mboxes("foo@bar.com", rules), ['spam']) - self.assertEqual(config.get_mboxes("foo@mydomain.com", rules), ['all']) - self.assertEqual(config.get_mboxes("first.last@mydomain.com", rules), - ['important', 'all']) + self.assertEqual(config.get_mboxes("foo@bar.com", rules), ["spam"]) + self.assertEqual(config.get_mboxes("foo@mydomain.com", rules), ["all"]) + self.assertEqual( + config.get_mboxes("first.last@mydomain.com", rules), ["important", "all"] + ) if __name__ == "__main__": diff --git a/tests/test_pop.py b/tests/test_pop.py index 9b2025f..93fd879 100644 --- a/tests/test_pop.py +++ b/tests/test_pop.py @@ -8,14 +8,18 @@ from mail4one.pop3 import create_pop_server from mail4one.config import User from pathlib import Path -TEST_HASH = "".join(c for c in """ +TEST_HASH = "".join( + c + for c in """ AFTY5EVN7AX47ZL7UMH3BETYWFBTAV3XHR73CEFAJBPN2NIHPWD ZHV2UQSMSPHSQQ2A2BFQBNC77VL7F2UKATQNJZGYLCSU6C43UQD AQXWXSWNGAEPGIMG2F3QDKBXL3MRHY6K2BPID64ZR6LABLPVSF -""" if not c.isspace()) +""" + if not c.isspace() +) -TEST_USER = 'foobar' -TEST_MBOX = 'foobar_mails' +TEST_USER = "foobar" +TEST_MBOX = "foobar_mails" USERS = [User(username=TEST_USER, password_hash=TEST_HASH, mbox=TEST_MBOX)] @@ -48,11 +52,11 @@ def setUpModule() -> None: unittest.addModuleCleanup(td.cleanup) MAILS_PATH = Path(td.name) os.mkdir(MAILS_PATH / TEST_MBOX) - for md in ('new', 'cur', 'tmp'): + for md in ("new", "cur", "tmp"): os.mkdir(MAILS_PATH / TEST_MBOX / md) - with open(MAILS_PATH / TEST_MBOX/ 'new/msg1.eml', 'wb') as f: + with open(MAILS_PATH / TEST_MBOX / "new/msg1.eml", "wb") as f: f.write(TESTMAIL) - with open(MAILS_PATH / TEST_MBOX/ 'new/msg2.eml', 'wb') as f: + with open(MAILS_PATH / TEST_MBOX / "new/msg2.eml", "wb") as f: f.write(TESTMAIL) logging.debug(MAILS_PATH) @@ -65,13 +69,11 @@ class TestPop3(unittest.IsolatedAsyncioTestCase): async def asyncSetUp(self) -> None: logging.debug("at asyncSetUp") - pop_server = await create_pop_server(host='127.0.0.1', - port=7995, - mails_path=MAILS_PATH, - users=USERS) + pop_server = await create_pop_server( + host="127.0.0.1", port=7995, mails_path=MAILS_PATH, users=USERS + ) self.task = asyncio.create_task(pop_server.serve_forever()) - self.reader, self.writer = await asyncio.open_connection( - '127.0.0.1', 7995) + self.reader, self.writer = await asyncio.open_connection("127.0.0.1", 7995) async def test_QUIT(self) -> None: dialog = """ @@ -115,8 +117,8 @@ class TestPop3(unittest.IsolatedAsyncioTestCase): await self.dialog_checker(dialog) async def test_dupe_AUTH(self) -> None: - r1, w1 = await asyncio.open_connection('127.0.0.1', 7995) - r2, w2 = await asyncio.open_connection('127.0.0.1', 7995) + r1, w1 = await asyncio.open_connection("127.0.0.1", 7995) + r2, w2 = await asyncio.open_connection("127.0.0.1", 7995) dialog = """ S: +OK Server Ready C: USER foobar @@ -206,9 +208,9 @@ class TestPop3(unittest.IsolatedAsyncioTestCase): async def dialog_checker(self, dialog: str) -> None: await self.dialog_checker_impl(self.reader, self.writer, dialog) - async def dialog_checker_impl(self, reader: asyncio.StreamReader, - writer: asyncio.StreamWriter, - dialog: str) -> None: + async def dialog_checker_impl( + self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter, dialog: str + ) -> None: for line in dialog.splitlines(): line = line.strip() if not line: @@ -222,5 +224,5 @@ class TestPop3(unittest.IsolatedAsyncioTestCase): self.assertEqual(data, resp) -if __name__ == '__main__': +if __name__ == "__main__": unittest.main() diff --git a/tests/test_pwhash.py b/tests/test_pwhash.py index 8378494..d596724 100644 --- a/tests/test_pwhash.py +++ b/tests/test_pwhash.py @@ -10,27 +10,31 @@ class TestPWHash(unittest.TestCase): pwinfo = parse_hash(pwhash) self.assertEqual(len(pwinfo.salt), SALT_LEN) self.assertEqual(len(pwinfo.scrypt_hash), KEY_LEN) - self.assertTrue(check_pass(password, pwinfo), - "check pass with correct password") - self.assertFalse(check_pass("foobar", pwinfo), - "check pass with wrong password") + self.assertTrue( + check_pass(password, pwinfo), "check pass with correct password" + ) + self.assertFalse(check_pass("foobar", pwinfo), "check pass with wrong password") def test_hardcoded_hash(self): - test_hash = "".join(c for c in """ + test_hash = "".join( + c + for c in """ AFTY5EVN7AX47ZL7UMH3BETYWFBTAV3XHR73CEFAJBPN2NIHPWD ZHV2UQSMSPHSQQ2A2BFQBNC77VL7F2UKATQNJZGYLCSU6C43UQD AQXWXSWNGAEPGIMG2F3QDKBXL3MRHY6K2BPID64ZR6LABLPVSF - """ if not c.isspace()) + """ + if not c.isspace() + ) pwinfo = parse_hash(test_hash) - self.assertTrue(check_pass("helloworld", pwinfo), - "check pass with correct password") - self.assertFalse(check_pass("foobar", pwinfo), - "check pass with wrong password") + self.assertTrue( + check_pass("helloworld", pwinfo), "check pass with correct password" + ) + self.assertFalse(check_pass("foobar", pwinfo), "check pass with wrong password") def test_invalid_hash(self): with self.assertRaises(Exception): parse_hash("sdlfkjdsklfjdsk") -if __name__ == '__main__': +if __name__ == "__main__": unittest.main() diff --git a/tests/test_smtp.py b/tests/test_smtp.py index 855f637..c3cac47 100644 --- a/tests/test_smtp.py +++ b/tests/test_smtp.py @@ -10,7 +10,7 @@ from pathlib import Path from mail4one.smtp import create_smtp_server -TEST_MBOX = 'foobar_mails' +TEST_MBOX = "foobar_mails" MAILS_PATH: Path @@ -21,7 +21,7 @@ def setUpModule() -> None: unittest.addModuleCleanup(td.cleanup) MAILS_PATH = Path(td.name) os.mkdir(MAILS_PATH / TEST_MBOX) - for md in ('new', 'cur', 'tmp'): + for md in ("new", "cur", "tmp"): os.mkdir(MAILS_PATH / TEST_MBOX / md) @@ -32,7 +32,8 @@ class TestSMTP(unittest.IsolatedAsyncioTestCase): host="127.0.0.1", port=7996, mails_path=MAILS_PATH, - mbox_finder=lambda addr: [TEST_MBOX]) + mbox_finder=lambda addr: [TEST_MBOX], + ) self.task = asyncio.create_task(smtp_server.serve_forever()) async def test_send_mail(self) -> None: @@ -45,8 +46,9 @@ class TestSMTP(unittest.IsolatedAsyncioTestCase): msg = b"".join(l.strip() + b"\r\n" for l in msg.splitlines()) def send_mail(): - with contextlib.closing(smtplib.SMTP(host="127.0.0.1", - port=7996)) as client: + with contextlib.closing( + smtplib.SMTP(host="127.0.0.1", port=7996) + ) as client: client.sendmail("foo@sender.com", "foo@bar.com", msg) _, local_port = client.sock.getsockname() return local_port @@ -62,7 +64,7 @@ class TestSMTP(unittest.IsolatedAsyncioTestCase): Byee """ expected = "".join(l.strip() + "\r\n" for l in expected.splitlines()) - mails = list((MAILS_PATH / TEST_MBOX / 'new').glob("*")) + mails = list((MAILS_PATH / TEST_MBOX / "new").glob("*")) self.assertEqual(len(mails), 1) self.assertEqual(mails[0].read_bytes(), expected.encode())