Fix issue where fixtures would lose the decorated functionality#3780

nicoddemus merged 2 commits intopytest-dev:masterpytest-dev/pytest:masterfrom

nicoddemus:mock-integration-fixnicoddemus/pytest:mock-integration-fixCopy head branch name to clipboard