[CRIU] [PATCH] zdtm.py: run --clean hook on test failure

Tycho Andersen tycho.andersen at canonical.com
Sun Nov 6 01:34:02 PST 2016


It seems to me most of the clean hooks (used by cgroup*, macvlan* cr_veth*
and mnt_tracefs* were all designed to be run to clean up after the test, no
matter whether it failed or succeeded. Let's always run them, so Andrei
doesn't hate me :D

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
CC: Andrei Vagin <avagin at openvz.org>
---
 test/zdtm.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/zdtm.py b/test/zdtm.py
index e032716..3eeeb2d 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1280,6 +1280,7 @@ def do_run_test(tname, tdesc, flavs, opts):
 			print_sep("Test %s FAIL at %s" % (tname, e.step), '#')
 			t.print_output()
 			t.kill()
+			try_run_hook(t, ["--clean"])
 			if cr_api.logs():
 				add_to_report(cr_api.logs(), tname.replace('/', '_') + "_" + f + "/images")
 			if opts['keep_img'] == 'never':
-- 
2.7.4



More information about the CRIU mailing list