mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 07:45:17 +00:00
Code Issues Releases Wiki Activity

zdtm: Handle crfail tests (expected dump failure)

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2015-10-20 17:10:22 +04:00
parent 896837cea8
commit 35603e51cc
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/zdtm.py
View File

@@ -164,7 +164,7 @@ class test_fail_exc:
def __init__(self, step): def __init__(self, step):
self.step = step self.step = step
class test_fault_injected_exc: class test_fail_expected_exc:
def __init__(self, cr_action): def __init__(self, cr_action):
self.cr_action = cr_action self.cr_action = cr_action
@@ -289,6 +289,9 @@ class zdtm_test:
def static(self): def static(self):
return self.__name.split('/')[2] == 'static' return self.__name.split('/')[2] == 'static'
def blocking(self):
return test_flag(self.__desc, 'crfail')
class inhfd_test: class inhfd_test:
@@ -372,6 +375,9 @@ class inhfd_test:
def static(self): def static(self):
return True return True
def blocking(self):
return False
test_classes = { 'zdtm': zdtm_test, 'inhfd': inhfd_test } test_classes = { 'zdtm': zdtm_test, 'inhfd': inhfd_test }
@@ -419,8 +425,8 @@ class criu_cli:
print "Run CRIU: [" + action + " " + " ".join(s_args) + "]" print "Run CRIU: [" + action + " " + " ".join(s_args) + "]"
ret = self.__criu(action, s_args, self.__fault) ret = self.__criu(action, s_args, self.__fault)
if ret != 0: if ret != 0:
if self.__fault: if self.__fault or self.__test.blocking():
raise test_fault_injected_exc(action) raise test_fail_expected_exc(action)
else: else:
grep_errors(os.path.join(self.__ddir(), log)) grep_errors(os.path.join(self.__ddir(), log))
raise test_fail_exc("CRIU %s" % action) raise test_fail_exc("CRIU %s" % action)
@@ -545,7 +551,7 @@ def do_run_test(tname, tdesc, flavs, opts):
s = get_visible_state(t) s = get_visible_state(t)
try: try:
cr(cr_api, t, opts) cr(cr_api, t, opts)
except test_fault_injected_exc as e: except test_fail_expected_exc as e:
if e.cr_action == "dump": if e.cr_action == "dump":
t.stop() t.stop()
try_run_hook(t, ["--fault", e.cr_action]) try_run_hook(t, ["--fault", e.cr_action])