bpo-35621: Fix tests when SafeChildWatcher is expected instead of ThreadedChildWatcher#13754

miss-islington merged 3 commits intopython:masterpython/cpython:masterfrom

asvetlov:fix-watcher-testasvetlov/cpython:fix-watcher-testCopy head branch name to clipboard