opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 19:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2947 from edsantiago/bats_in_cirrus

Browse Source 
run BATS tests in Cirrus
This commit is contained in:
OpenShift Merge Robot
2019-06-17 22:51:23 +02:00
committed by GitHub
parent 6ee0f3e99f d6f436204f
commit e639a8fa3b
4 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -278,6 +278,7 @@ testing_task:
setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}' unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}'
integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}' integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
on_failure: on_failure:
failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh' failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh'
@ -311,6 +312,7 @@ special_testing_rootless_task:
setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}' integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
on_failure: on_failure:
failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh' failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh'

7
Makefile
View File

@ -220,8 +220,11 @@ localintegration: varlink_generate test-binaries ginkgo
remoteintegration: varlink_generate test-binaries ginkgo-remote remoteintegration: varlink_generate test-binaries ginkgo-remote
localsystem: .install.ginkgo localsystem:
ginkgo -v -noColor test/system/ if timeout -v 1 true; then PODMAN=./bin/podman bats test/system/; else echo "Skipping localsystem: 'timeout -v' unavailable'"; fi
remotesystem:
@echo "remotesystem - unimplemented"
system.test-binary: .install.ginkgo system.test-binary: .install.ginkgo
$(GO) test -c ./test/system $(GO) test -c ./test/system

21
contrib/cirrus/system_test.sh
View File

@ -1,21 +0,0 @@
#!/bin/bash
set -e
source $(dirname $0)/lib.sh
req_env_var GOSRC OS_RELEASE_ID OS_RELEASE_VER
set -x
cd "$GOSRC"
case "${OS_RELEASE_ID}" in
ubuntu) ;& # Continue to the next item
fedora)
make install.tools
make
make test-binaries
;;
*) bad_os_id_ver ;;
esac
make localsystem

1
contrib/cirrus/system_test.sh Symbolic link
View File

@ -0,0 +1 @@
integration_test.sh

4
test/system/030-run.bats
View File

@ -9,8 +9,8 @@ true | 0 |
false | 1 | false | 1 |
sh -c 'exit 32' | 32 | sh -c 'exit 32' | 32 |
echo $rand | 0 | $rand echo $rand | 0 | $rand
/no/such/command | 127 | Error: container create failed:.*exec:.* no such file or dir /no/such/command | 127 | Error: .*: starting container process caused .*exec:.*stat /no/such/command: no such file or directory
/etc | 126 | Error: container create failed:.*exec:.* permission denied /etc | 126 | Error: .*: starting container process caused .*exec:.* permission denied
" "
while read cmd expected_rc expected_output; do while read cmd expected_rc expected_output; do