Git was sometimes getting stuck in a race condition.  Reorder expect symbols and add a timeout to hopefully fix, or at least allow an abort, from such situations.