Commit 2fb61d3f authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

zdtm.py: grep errors even if criu exists with 0

Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 3fbb8e7f
......@@ -508,11 +508,11 @@ class criu_cli:
print "Run criu " + action
ret = self.__criu(action, s_args, self.__fault)
grep_errors(os.path.join(self.__ddir(), log))
if ret != 0:
if self.__fault or self.__test.blocking():
raise test_fail_expected_exc(action)
else:
grep_errors(os.path.join(self.__ddir(), log))
raise test_fail_exc("CRIU %s" % action)
def dump(self, action, opts = []):
......@@ -783,10 +783,14 @@ def print_sep(title, sep = "="):
print (" " + title + " ").center(80, sep)
def grep_errors(fname):
print_sep("grep Error")
first = True
for l in open(fname):
if "Error" in l:
if first:
print_sep("grep Error")
first = False
print l,
if not first:
print_sep("ERROR OVER")
def run_tests(opts):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment