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

Merge pull request #1025 from edsantiago/safer_conmon_chmod

Browse source 
Issue #1024: don't chmod a nonexistent file
This commit is contained in:
Mrunal Patel 2017-10-17 22:04:04 -07:00 committed by GitHub
commit 542994ff2a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/network.bats
View file

@ -7,6 +7,7 @@ function teardown() {
cleanup_pods cleanup_pods
stop_crio stop_crio
rm -f /var/lib/cni/networks/crionet_test_args/* rm -f /var/lib/cni/networks/crionet_test_args/*
chmod 0755 $CONMON_BINARY
cleanup_test cleanup_test
} }
@ -171,11 +172,11 @@ function teardown() {
# make conmon non-executable to cause the sandbox setup to fail after # make conmon non-executable to cause the sandbox setup to fail after
# networking has been configured # networking has been configured
chmod 0644 /go/src/github.com/kubernetes-incubator/cri-o/conmon/conmon chmod 0644 $CONMON_BINARY
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crioctl pod run --config "$TESTDATA"/sandbox_config.json
chmod 0755 $CONMON_BINARY
echo "$output" echo "$output"
[ "$status" -ne 0 ] [ "$status" -ne 0 ]
chmod 0755 /go/src/github.com/kubernetes-incubator/cri-o/conmon/conmon
# ensure that the server cleaned up sandbox networking if the sandbox # ensure that the server cleaned up sandbox networking if the sandbox
# failed after network setup # failed after network setup