Work around for race condition bug #2320 in python 2.7

Signed-off-by: markhpc <mark.a.nelson@gmail.com>
Big revamp to abstract recovery testing code.

Signed-off-by: markhpc <mark.a.nelson@gmail.com>