Fix SetupState breakage with upcoming pytest 6.3#151

icemac merged 3 commits intopytest-dev:masterpytest-dev/pytest-rerunfailures:masterfrom

bluetech:pytest63bluetech/pytest-rerunfailures:pytest63Copy head branch name to clipboard