From e7e156a0178298278cfb11f92d64dc3d70ec5804 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sun, 17 May 2020 01:04:32 +0100 Subject: [PATCH 1/4] Use subTest in test_unparse for better error reporting --- Lib/test/test_unparse.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_unparse.py b/Lib/test/test_unparse.py index d543ca2526ecee..b60f4e0ef885e1 100644 --- a/Lib/test/test_unparse.py +++ b/Lib/test/test_unparse.py @@ -120,13 +120,15 @@ def assertASTEqual(self, ast1, ast2): self.assertEqual(ast.dump(ast1), ast.dump(ast2)) def check_ast_roundtrip(self, code1, **kwargs): - ast1 = ast.parse(code1, **kwargs) - code2 = ast.unparse(ast1) - ast2 = ast.parse(code2, **kwargs) - self.assertASTEqual(ast1, ast2) + with self.subTest(code1=code1, ast_parse_kwargs=kwargs): + ast1 = ast.parse(code1, **kwargs) + code2 = ast.unparse(ast1) + ast2 = ast.parse(code2, **kwargs) + self.assertASTEqual(ast1, ast2) def check_invalid(self, node, raises=ValueError): - self.assertRaises(raises, ast.unparse, node) + with self.subTest(node=node, raises=raises): + self.assertRaises(raises, ast.unparse, node) def get_source(self, code1, code2=None): code2 = code2 or code1 @@ -134,12 +136,14 @@ def get_source(self, code1, code2=None): return code1, code2 def check_src_roundtrip(self, code1, code2=None): - code1, code2 = self.get_source(code1, code2) - self.assertEqual(code2, code1) + with self.subTest(code1=code1, code2=code2): + code1, code2 = self.get_source(code1, code2) + self.assertEqual(code2, code1) def check_src_dont_roundtrip(self, code1, code2=None): - code1, code2 = self.get_source(code1, code2) - self.assertNotEqual(code2, code1) + with self.subTest(code1=code1, code2=code2): + code1, code2 = self.get_source(code1, code2) + self.assertNotEqual(code2, code1) class UnparseTestCase(ASTTestCase): # Tests for specific bugs found in earlier versions of unparse From ca73ed69f3436a267abe1e1865b417939d3d061a Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sun, 17 May 2020 01:20:36 +0100 Subject: [PATCH 2/4] fixup! Use subTest in test_unparse for better error reporting --- Lib/test/test_unparse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_unparse.py b/Lib/test/test_unparse.py index b60f4e0ef885e1..1db8e6c3dd1bd0 100644 --- a/Lib/test/test_unparse.py +++ b/Lib/test/test_unparse.py @@ -141,8 +141,8 @@ def check_src_roundtrip(self, code1, code2=None): self.assertEqual(code2, code1) def check_src_dont_roundtrip(self, code1, code2=None): + code1, code2 = self.get_source(code1, code2) with self.subTest(code1=code1, code2=code2): - code1, code2 = self.get_source(code1, code2) self.assertNotEqual(code2, code1) class UnparseTestCase(ASTTestCase): From c6e8a43a460d1d2adb66feec94c73b7cefd23ce9 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sun, 17 May 2020 02:51:22 +0100 Subject: [PATCH 3/4] Update Lib/test/test_unparse.py Co-authored-by: Batuhan Taskaya --- Lib/test/test_unparse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_unparse.py b/Lib/test/test_unparse.py index 1db8e6c3dd1bd0..d200fe7c2010dc 100644 --- a/Lib/test/test_unparse.py +++ b/Lib/test/test_unparse.py @@ -136,8 +136,8 @@ def get_source(self, code1, code2=None): return code1, code2 def check_src_roundtrip(self, code1, code2=None): + code1, code2 = self.get_source(code1, code2) with self.subTest(code1=code1, code2=code2): - code1, code2 = self.get_source(code1, code2) self.assertEqual(code2, code1) def check_src_dont_roundtrip(self, code1, code2=None): From bc66e8719e7fa3729252894e758b75acfdbac7d1 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sun, 17 May 2020 03:11:12 +0100 Subject: [PATCH 4/4] Update Lib/test/test_unparse.py --- Lib/test/test_unparse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_unparse.py b/Lib/test/test_unparse.py index d200fe7c2010dc..67dcb1dae79ff2 100644 --- a/Lib/test/test_unparse.py +++ b/Lib/test/test_unparse.py @@ -127,7 +127,7 @@ def check_ast_roundtrip(self, code1, **kwargs): self.assertASTEqual(ast1, ast2) def check_invalid(self, node, raises=ValueError): - with self.subTest(node=node, raises=raises): + with self.subTest(node=node): self.assertRaises(raises, ast.unparse, node) def get_source(self, code1, code2=None):