Commit 0ef04e95 authored by Adrian DC's avatar Adrian DC
Browse files

test(console, notify, simple): kill after timeout in '--{bash,debug}' 

Signed-off-by: default avatarAdrian DC <radian.dc@gmail.com>
parent 02e3d2dc

tests/console/test.sh

+5 −5
Changes for tests/console/test.sh: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ cd "${test_path}/" 
set -ex



# Run tests

timeout 10 timeout 2 gitlabci-local --bash 'Job 1' </dev/null && exit 1 || true

timeout 10 timeout 2 gitlabci-local --bash 'Job 1' </dev/null && exit 1 || true

timeout 10 timeout 2 gitlabci-local --bash --no-console 'Job 1' && exit 1 || true

timeout 15 timeout 10 pexpect-executor --wait 2 --press exit --enter -- gitlabci-local --bash 'Job 1' && exit 1 || true

timeout 15 timeout 10 pexpect-executor -- timeout 3 gitlabci-local --bash --no-console 'Job 1' && exit 1 || true
 
timeout 10 timeout -k 5 2 gitlabci-local --bash 'Job 1' </dev/null && exit 1 || true

timeout 10 timeout -k 5 2 gitlabci-local --bash 'Job 1' </dev/null && exit 1 || true

timeout 10 timeout -k 5 2 gitlabci-local --bash --no-console 'Job 1' && exit 1 || true

timeout 15 timeout -k 12 10 pexpect-executor --wait 2 --press exit --enter -- gitlabci-local --bash 'Job 1' && exit 1 || true

timeout 15 timeout -k 12 10 pexpect-executor -- timeout 3 gitlabci-local --bash --no-console 'Job 1' && exit 1 || true

tests/notify/test.sh

+2 −2
Changes for tests/notify/test.sh: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ gitlabci-local -c ./.gitlab-ci.local.yml 'Job 1' 
gitlabci-local -c ./.gitlab-ci.local.yml 'Job 2' && exit 1 || true

gitlabci-local -c ./.gitlab-ci.local.yml -p && exit 1 || true

gitlabci-local -c ./.gitlab-ci.image.yml --pull

timeout 5 gitlabci-local -c ./.gitlab-ci.image.yml --bash --notify 'Job 1' && exit 1 || true

timeout 5 gitlabci-local -c ./.gitlab-ci.image.yml --debug --notify 'Job 1' && exit 1 || true

timeout 10 timeout -k 8 5 gitlabci-local -c ./.gitlab-ci.image.yml --bash --notify 'Job 1' && exit 1 || true

timeout 10 timeout -k 8 5 gitlabci-local -c ./.gitlab-ci.image.yml --debug --notify 'Job 1' && exit 1 || true

timeout 5 gitlabci-local -c ./.gitlab-ci.image.yml --notify 'Job 2' && exit 1 || true

tests/simple/test.sh

+4 −4
Changes for tests/simple/test.sh: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ gitlabci-local -H -q -p 
gcil -H -p

timeout 5 gitlabci-local 'Job 1' -H --sockets

SSH_AUTH_SOCK=/tmp/ timeout 5 gitlabci-local 'Job 1' --ssh

timeout 5 gitlabci-local 'Job 1' --bash && exit 1 || true

timeout 5 gitlabci-local 'Job 2' --bash && exit 1 || true

timeout 5 gitlabci-local 'Job 1' --debug && exit 1 || true

timeout 5 gitlabci-local 'Job 1' --bash --shell 'bash --login' && exit 1 || true

timeout 10 timeout -k 8 5 gitlabci-local 'Job 1' --bash && exit 1 || true

timeout 10 timeout -k 8 5 gitlabci-local 'Job 2' --bash && exit 1 || true

timeout 10 timeout -k 8 5 gitlabci-local 'Job 1' --debug && exit 1 || true

timeout 10 timeout -k 8 5 gitlabci-local 'Job 1' --bash --shell 'bash --login' && exit 1 || true

! type sudo >/dev/null 2>&1 || (sudo -E env PYTHONPATH="${PYTHONPATH}" timeout 5 gitlabci-local 'Job 1' --debug && exit 1 || true)

gcil -H Job

gcil -H 1