On Wed, Oct 18, 2017 at 05:51:53PM +0200, Paolo Bonzini wrote: > On 18/10/2017 17:50, Jeff Cody wrote: > > Here is what we need from common.rc for this series: > > > > _rm_test_img > > _cleanup_nbd > > _cleanup_vxhs > > _cleanup_rbd > > _cleanup_sheepdog > > _cleanup_protocols > > _cleanup_test_img > > > > > > They all have a common theme (cleanup), so I could move them all to a > > common.cleanup (naming suggestion?) file (which would need to be included by > > common.rc, as well). > > > > Would this be a strong enough delineation to overcome your concerns? > > A great start. Which of these are actually needed by the tests (and > hence by common.rc) and why? >
Some tests are written such that they do intermediate cleanups between multiple internal sub-tests for varying reasons, and so use those cleanup functions as part of their testing. The function _cleanup_test_img effectively calls all the other functions I listed, so they are really all required for the tests, if they choose to call _cleanup_test_img. And for 'check' to tear everything down to a clean state, it also needs to use the cleanup functions for everything that is not just a file/directory. -Jeff