vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1110 from edsantiago/more_testing_fixes

Browse source 
Various test-scaffolding fixes
This commit is contained in:
Daniel J Walsh 2017-11-10 08:22:06 -05:00 committed by GitHub
commit e9200aacba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/ctr_seccomp.bats
View file

@ -15,7 +15,7 @@ function teardown() {
skip "skip this test since seccomp is not enabled." skip "skip this test since seccomp is not enabled."
fi fi
sed -e 's/"chmod",//' "$CRIO_ROOT"/cri-o/seccomp.json > "$TESTDIR"/seccomp_profile1.json sed -e 's/"chmod",//' "$SECCOMP_PROFILE" > "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json
@ -51,7 +51,7 @@ function teardown() {
skip "skip this test since seccomp is not enabled." skip "skip this test since seccomp is not enabled."
fi fi
sed -e 's/"chmod",//' "$CRIO_ROOT"/cri-o/seccomp.json > "$TESTDIR"/seccomp_profile1.json sed -e 's/"chmod",//' "$SECCOMP_PROFILE" > "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json
@ -89,7 +89,7 @@ function teardown() {
skip "skip this test since seccomp is not enabled." skip "skip this test since seccomp is not enabled."
fi fi
sed -e 's/"chmod",//' "$CRIO_ROOT"/cri-o/seccomp.json > "$TESTDIR"/seccomp_profile1.json sed -e 's/"chmod",//' "$SECCOMP_PROFILE" > "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json
@ -124,7 +124,7 @@ function teardown() {
skip "skip this test since seccomp is not enabled." skip "skip this test since seccomp is not enabled."
fi fi
sed -e 's/"chmod",//' "$CRIO_ROOT"/cri-o/seccomp.json > "$TESTDIR"/seccomp_profile1.json sed -e 's/"chmod",//' "$SECCOMP_PROFILE" > "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json
@ -156,7 +156,7 @@ function teardown() {
start_crio start_crio
sed -e 's/"chmod",//' "$CRIO_ROOT"/cri-o/seccomp.json > "$TESTDIR"/seccomp_profile1.json sed -e 's/"chmod",//' "$SECCOMP_PROFILE" > "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json
@ -191,7 +191,7 @@ function teardown() {
skip "skip this test since seccomp is not enabled." skip "skip this test since seccomp is not enabled."
fi fi
sed -e 's/"chmod",//' "$CRIO_ROOT"/cri-o/seccomp.json > "$TESTDIR"/seccomp_profile1.json sed -e 's/"chmod",//' "$SECCOMP_PROFILE" > "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmod",//' "$TESTDIR"/seccomp_profile1.json
sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json sed -i 's/"fchmodat",//g' "$TESTDIR"/seccomp_profile1.json

12
test/helpers.bash
View file

@ -286,8 +286,8 @@ function start_crio() {
} }
function cleanup_ctrs() { function cleanup_ctrs() {
run crictl ps --quiet output=$(crictl ps --quiet)
if [ "$status" -eq 0 ]; then if [ $? -eq 0 ]; then
if [ "$output" != "" ]; then if [ "$output" != "" ]; then
printf '%s\n' "$output" | while IFS= read -r line printf '%s\n' "$output" | while IFS= read -r line
do do
@ -300,8 +300,8 @@ function cleanup_ctrs() {
} }
function cleanup_images() { function cleanup_images() {
run crictl images --quiet output=$(crictl images --quiet)
if [ "$status" -eq 0 ]; then if [ $? -eq 0 ]; then
if [ "$output" != "" ]; then if [ "$output" != "" ]; then
printf '%s\n' "$output" | while IFS= read -r line printf '%s\n' "$output" | while IFS= read -r line
do do
@ -312,8 +312,8 @@ function cleanup_images() {
} }
function cleanup_pods() { function cleanup_pods() {
run crictl sandboxes --quiet output=$(crictl sandboxes --quiet)
if [ "$status" -eq 0 ]; then if [ $? -eq 0 ]; then
if [ "$output" != "" ]; then if [ "$output" != "" ]; then
printf '%s\n' "$output" | while IFS= read -r line printf '%s\n' "$output" | while IFS= read -r line
do do

6
test/network.bats
View file

@ -127,6 +127,9 @@ function teardown() {
} }
@test "Ensure correct CNI plugin namespace/name/container-id arguments" { @test "Ensure correct CNI plugin namespace/name/container-id arguments" {
if [[ ! -e "$CRIO_CNI_PLUGIN"/bridge-custom ]]; then
skip "bridge-custom plugin not available"
fi
start_crio "" "" "" "prepare_plugin_test_args_network_conf" start_crio "" "" "" "prepare_plugin_test_args_network_conf"
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crioctl pod run --config "$TESTDATA"/sandbox_config.json
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -168,6 +171,9 @@ function teardown() {
} }
@test "Clean up network if pod sandbox fails" { @test "Clean up network if pod sandbox fails" {
if [[ ! -e "$CRIO_CNI_PLUGIN"/bridge-custom ]]; then
skip "bridge-custom plugin not available"
fi
start_crio "" "" "" "prepare_plugin_test_args_network_conf" start_crio "" "" "" "prepare_plugin_test_args_network_conf"
# make conmon non-executable to cause the sandbox setup to fail after # make conmon non-executable to cause the sandbox setup to fail after