From 314e1ead8ce83fcdc187c551d2d49549c80eabf3 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 27 Feb 2017 11:29:17 -0800 Subject: change to test to make it easier to see failures --- src/engine/SCons/SubstTests.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/engine/SCons/SubstTests.py b/src/engine/SCons/SubstTests.py index 8eda845..c11f247 100644 --- a/src/engine/SCons/SubstTests.py +++ b/src/engine/SCons/SubstTests.py @@ -251,7 +251,7 @@ class SubstTestCase(unittest.TestCase): else: if result != expect: if failed == 0: print() - print(" input %s => %s did not match %s" % (repr(input), repr(result), repr(expect))) + print(" input %s => \n%s did not match \n%s" % (repr(input), repr(result), repr(expect))) failed = failed + 1 del cases[:2] fmt = "%d %s() cases failed" @@ -571,7 +571,10 @@ class scons_subst_TestCase(SubstTestCase): except SCons.Errors.UserError as e: expect = [ # Python 2.3, 2.4, 2.5 - "TypeError `func() takes exactly 3 arguments (1 given)' trying to evaluate `${func(1)}'" + "TypeError `func() takes exactly 3 arguments (1 given)' trying to evaluate `${func(1)}'", + + # Python 3.5 (and 3.x?) + "TypeError `func() missing 2 required positional arguments: 'b' and 'c'' trying to evaluate `${func(1)}'" ] assert str(e) in expect, repr(str(e)) else: -- cgit v0.12