modified:   flocker/testtools.py