From 2bc78056e8269e4a0986104208533a68d0f58f11 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Wed, 26 Mar 2014 00:43:59 +0100 Subject: Ack PyPy SyntaxError --- testsuite/test_api.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testsuite/test_api.py b/testsuite/test_api.py index 1846096..ea18eca 100644 --- a/testsuite/test_api.py +++ b/testsuite/test_api.py @@ -330,8 +330,15 @@ class APITestCase(unittest.TestCase): pep8style = pep8.StyleGuide() count_errors = pep8style.input_file('stdin', lines=['\x00\n']) - self.assertTrue(sys.stdout[0].startswith("stdin:1:1: E901 TypeError"), - msg='Output is %r' % sys.stdout[0]) + stdout = sys.stdout.getvalue() + if 'SyntaxError' in stdout: + # PyPy 2.2 returns a SyntaxError + expected = "stdin:1:2: E901 SyntaxError" + else: + expected = "stdin:1:1: E901 TypeError" + self.assertTrue(stdout.startswith(expected),, + msg='Output %r does not start with %r' % + (stdout, expected)) self.assertFalse(sys.stderr) self.assertEqual(count_errors, 1) -- cgit v1.2.1