Commit 8869d3cc authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

test/rpc: don't use shell-job

We want to execute this test in Jenkins.
Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 23426070
......@@ -78,7 +78,6 @@ class test:
# Perform self-dump
req = self.get_base_req()
req.type = rpc.DUMP
req.opts.shell_job = True
req.opts.leave_running = True
self.send_req(req)
......
......@@ -30,20 +30,20 @@ function test_c {
mkdir -p build/imgs_c
title_print "Run test-c"
setsid ./test-c build/criu_service.socket build/imgs_c < /dev/null &>> build/output
setsid ./test-c build/criu_service.socket build/imgs_c < /dev/null &>> build/output_c
title_print "Restore test-c"
${CRIU} restore -v4 -o restore-c.log -D build/imgs_c --shell-job
${CRIU} restore -v4 -o restore-c.log -D build/imgs_c
}
function test_py {
mkdir -p build/imgs_py
title_print "Run test-py"
setsid ./test.py build/criu_service.socket build/imgs_py < /dev/null &>> build/output
setsid ./test.py build/criu_service.socket build/imgs_py < /dev/null &>> build/output_py
title_print "Restore test-py"
${CRIU} restore -v4 -o restore-py.log -D build/imgs_py --shell-job
${CRIU} restore -v4 -o restore-py.log -D build/imgs_py
}
function test_restore_loop {
......@@ -66,14 +66,14 @@ function test_ps {
mkdir -p build/imgs_ps
title_print "Run ps_test"
setsid ./ps_test.py build/criu_service.socket build/imgs_ps < /dev/null &>> output
setsid ./ps_test.py build/criu_service.socket build/imgs_ps < /dev/null &>> output_ps
}
function test_errno {
mkdir -p build/imgs_errno
title_print "Run cr_errno test"
setsid ./errno.py build/criu_service.socket build/imgs_errno < /dev/null &>> output
setsid ./errno.py build/criu_service.socket build/imgs_errno < /dev/null &>> output_errno
}
trap 'echo "FAIL"; stop_server' EXIT
......
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