split out the simpler parts of ConditionTest

This makes fixing bugs that have the effect of deadlocking pretty much
everything easier.

Change-Id: I33119aaf00bd4375aef125ce4f7cbd3049e31db1
2 files changed