Commit0ff7b99

authored

gh-94052: Don't re-run failed tests with --python option (#94054)

1 parent94eeac0 commit0ff7b99Copy full SHA for 0ff7b99

File tree

+17

-6

lines changed

+17

-6

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`importargparse`
`2`	`2`	`importos`
	`3`	`+importshlex`
`3`	`4`	`importsys`
`4`	`5`	`fromtest.supportimportos_helper`
`5`	`6`
`@@ -372,8 +373,11 @@ def _parse_args(args, **kwargs):`
`372`	`373`	`parser.error("-s and -f don't go together!")`
`373`	`374`	`ifns.use_mpisnotNoneandns.trace:`
`374`	`375`	`parser.error("-T and -j don't go together!")`
`375`		`-ifns.pythonisnotNoneandns.use_mpisNone:`
`376`		`-parser.error("-p requires -j!")`
	`376`	`+ifns.pythonisnotNone:`
	`377`	`+ifns.use_mpisNone:`
	`378`	`+parser.error("-p requires -j!")`
	`379`	`+# The "executable" may be two or more parts, e.g. "node python.js"`
	`380`	`+ns.python=shlex.split(ns.python)`
`377`	`381`	`ifns.failfastandnot (ns.verboseorns.verbose3):`
`378`	`382`	`parser.error("-G/--failfast needs either -v or -W")`
`379`	`383`	`ifns.pgoand (ns.verboseorns.verbose2orns.verbose3):`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -306,13 +306,22 @@ def list_cases(self):`
`306`	`306`	`printlist(self.skipped,file=sys.stderr)`
`307`	`307`
`308`	`308`	`defrerun_failed_tests(self):`
	`309`	`+self.log()`
	`310`	`+`
	`311`	`+ifself.ns.python:`
	`312`	`+# Temp patch for https://github.com/python/cpython/issues/94052`
	`313`	`+self.log(`
	`314`	`+"Re-running failed tests is not supported with --python "`
	`315`	`+"host runner option."`
	`316`	`+ )`
	`317`	`+return`
	`318`	`+`
`309`	`319`	`self.ns.verbose=True`
`310`	`320`	`self.ns.failfast=False`
`311`	`321`	`self.ns.verbose3=False`
`312`	`322`
`313`	`323`	`self.first_result=self.get_tests_result()`
`314`	`324`
`315`		`-self.log()`
`316`	`325`	`self.log("Re-running failed tests in verbose mode")`
`317`	`326`	`rerun_list=list(self.need_rerun)`
`318`	`327`	`self.need_rerun.clear()`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`importjson`
`3`	`3`	`importos.path`
`4`	`4`	`importqueue`
`5`		`-importshlex`
`6`	`5`	`importsignal`
`7`	`6`	`importsubprocess`
`8`	`7`	`importsys`
`@@ -59,8 +58,7 @@ def run_test_in_subprocess(testname: str, ns: Namespace, tmp_dir: str) -> subpro`
`59`	`58`	`worker_args= (ns_dict,testname)`
`60`	`59`	`worker_args=json.dumps(worker_args)`
`61`	`60`	`ifns.pythonisnotNone:`
`62`		`-# The "executable" may be two or more parts, e.g. "node python.js"`
`63`		`-executable=shlex.split(ns.python)`
	`61`	`+executable=ns.python`
`64`	`62`	`else:`
`65`	`63`	`executable= [sys.executable]`
`66`	`64`	`cmd= [executable,support.args_from_interpreter_flags(),`

Comments

(0)