Clean up type hints from #13345 and add a test#13348

nicoddemus merged 2 commits intopytest-dev:mainpytest-dev/pytest:mainfrom

rouge8:gh-12491-round-2rouge8/pytest:gh-12491-round-2Copy head branch name to clipboard