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

Issue #1024: don't chmod a nonexistent file

Browse source 
New network test makes improper assumptions about conmon path.
Use predefined CONMON_BINARY variable instead.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2017-10-17 10:07:35 -06:00 committed by Antonio Murdaca
parent fc2457a3f0
commit 6dcf27f8cb
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/network.bats
View file

@ -171,11 +171,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