Bug 997909 - Make waitFor actually terminate if condition is never true, r=mdas