Lock/unlock of db breaks if pytest is executed twice in the same process (fixes #1147)#1148

bluetech merged 2 commits intopytest-dev:mainpytest-dev/pytest-django:mainfrom

boxed:issue-1147boxed/pytest-django:issue-1147Copy head branch name to clipboard