Comment 3 for bug 1310704

OK, just found the source of the flaky tests. There were a couple commits in our development branch that did not make it into the charm store review.

As we discussed on IRC, we had already seen and fixed these errors in the past, but the reason you didn't see them is we had not merged them correctly. Apologies!

I have merged just those changes up for inclusion. They are well tested, and it was simply a merge error that caused these commits to be missing. You should have 2 extra revisions now from when you reviewed originally. It's now up to r154.

Thanks!