From 0dd6f1c92cb29ce2e80c5d66597e9fe9553d3070 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Tue, 22 Nov 2022 08:04:13 -0700 Subject: Fix one test in TestCommonTests [ci skip] The framework tests have been failing one test in the Common set, partly due to a missing None in the expected text for the exception test, and partly due to a change in SCons code that appears in a traceback that had been captured, but not properly escaped. Signed-off-by: Mats Wichmann --- testing/framework/TestCommonTests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testing/framework/TestCommonTests.py b/testing/framework/TestCommonTests.py index 68f52cf..67859d8 100644 --- a/testing/framework/TestCommonTests.py +++ b/testing/framework/TestCommonTests.py @@ -1933,6 +1933,7 @@ class run_TestCase(TestCommonTestCase): STDOUT ========================================================================= None STDERR ========================================================================= + None """) expect_stderr = lstrip("""\ @@ -1940,13 +1941,13 @@ class run_TestCase(TestCommonTestCase): Traceback \\(most recent call last\\): File "", line \\d+, in (\\?|) File "[^"]+TestCommon.py", line \\d+, in run - super().run\\(\\*\\*kw\\) + super\\(\\).run\\(\\*\\*kw\\) File "[^"]+TestCmd.py", line \\d+, in run - p = self.start(program=program, + p = self.start\\(program=program, File "[^"]+TestCommon.py", line \\d+, in start raise e File "[^"]+TestCommon.py", line \\d+, in start - return super().start\\(program, interpreter, arguments, + return super\\(\\).start\\(program, interpreter, arguments, File "", line \\d+, in raise_exception TypeError: forced TypeError """ % re.escape(repr(sys.executable))) -- cgit v0.12