Commit96bd499

committed

gh-117174: Respect tests that require environment variables with no-colorize fixes

1 parent5da0280 commit96bd499Copy full SHA for 96bd499

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,7 @@ def f():`
`384`	`384`	`])`
`385`	`385`
`386`	`386`	`@requires_subprocess()`
	`387`	`+@force_not_colorized`
`387`	`388`	`deftest_encoded_file(self):`
`388`	`389`	`# Test that tracebacks are correctly printed for encoded source files:`
`389`	`390`	`# - correct line number (Issue2384)`
`@@ -410,7 +411,7 @@ def do_test(firstlines, message, charset, lineno):`
`410`	`411`	`""".format(firstlines,message))`
`411`	`412`
`412`	`413`	`process=subprocess.Popen([sys.executable,TESTFN],`
`413`		`-stdout=subprocess.PIPE,stderr=subprocess.STDOUT,env={})`
	`414`	`+stdout=subprocess.PIPE,stderr=subprocess.STDOUT)`
`414`	`415`	`stdout,stderr=process.communicate()`
`415`	`416`	`stdout=stdout.decode(output_encoding).splitlines()`
`416`	`417`	`finally:`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`interpreter_requires_environment)`
`9`	`9`	`fromtestimportsupport`
`10`	`10`	`fromtest.supportimportos_helper`
	`11`	`+fromtest.supportimportforce_not_colorized`
`11`	`12`
`12`	`13`	`try:`
`13`	`14`	`import_testcapi`
`@@ -938,11 +939,12 @@ def test_env_limit(self):`
`938`	`939`	`stdout=stdout.rstrip()`
`939`	`940`	`self.assertEqual(stdout,b'10')`
`940`	`941`
	`942`	`+@force_not_colorized`
`941`	`943`	`defcheck_env_var_invalid(self,nframe):`
`942`	`944`	`withsupport.SuppressCrashReport():`
`943`	`945`	`ok,stdout,stderr=assert_python_failure(`
`944`	`946`	`'-c','pass',`
`945`		`-PYTHONTRACEMALLOC=str(nframe),__cleanenv=True)`
	`947`	`+PYTHONTRACEMALLOC=str(nframe))`
`946`	`948`
`947`	`949`	`ifb'ValueError: the number of frames must be in range'instderr:`
`948`	`950`	`return`

Comments

(0)