[Bug 47998] Better deal with random test failures