Merge: #5713: fix timing issue in smtplib tests.