diff options
| author | Pavel Tikhomirov <ptikhomirov@virtuozzo.com> | 2019-02-12 12:48:14 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2019-04-21 06:25:26 +0300 |
| commit | c77a52ec7fff8079727d027909ed15eafa16145f (patch) | |
| tree | a357ba3bd8f9fc1082e6f0817662bafc7bb78043 /test | |
| parent | d715f176ba6e7a0662db690647cf23e99282a3b1 (diff) | |
zdtm.py: expect test to fail if crfail flag is set
Suppress the false positive fail in criu-live-migration job:
https://ci.openvz.org/job/CRIU/job/criu-live-migration/job/criu-dev/1796/
[criu]# ./test/zdtm.py run -t zdtm/static/overmounted_file -f uns --lazy-migrate
=== Run 1/1 ================ zdtm/static/overmounted_file
=================== Run zdtm/static/overmounted_file in uns ====================
Start test
Test is SUID
./overmounted_file --pidfile=overmounted_file.pid --outfile=overmounted_file.out --dirname=overmounted_file.test
Run criu dump
Test zdtm/static/overmounted_file FAIL at criu dump exited with 1 ######
Send the 9 signal to 49
Wait for zdtm/static/overmounted_file(49) to die for 0.100000
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/zdtm.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/zdtm.py b/test/zdtm.py index 7fd79a0b0..57a77f768 100755 --- a/test/zdtm.py +++ b/test/zdtm.py @@ -1052,7 +1052,10 @@ class criu: os.close(status_fds[1]) if os.read(status_fds[0], 1) != b'\0': ret = ret.wait() - raise test_fail_exc("criu %s exited with %s" % (action, ret)) + if self.__test.blocking(): + raise test_fail_expected_exc(action) + else: + raise test_fail_exc("criu %s exited with %s" % (action, ret)) os.close(status_fds[0]) return ret |