Issue #25322: Merge contextlib.suppress test fix from 3.4 into 3.5