kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #39591 from crosbymichael/perm-test

Browse source 
Add extra permission check in removal test
This commit is contained in:
Sebastiaan van Stijn 2019-07-26 09:41:51 -07:00 committed by GitHub
commit 9f122f0d2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
integration/image/remove_unix_test.go
View file

@ -8,6 +8,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"strconv" "strconv"
"strings"
"syscall" "syscall"
"testing" "testing"
"unsafe" "unsafe"
@ -75,7 +76,11 @@ func TestRemoveImageGarbageCollector(t *testing.T) {
argp = uintptr(unsafe.Pointer(&attr)) argp = uintptr(unsafe.Pointer(&attr))
_, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), fsflags, argp) _, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), fsflags, argp)
assert.Equal(t, "errno 0", errno.Error()) assert.Equal(t, "errno 0", errno.Error())
assert.ErrorContains(t, err, "permission denied") assert.Assert(t, err != nil)
errStr := err.Error()
if !(strings.Contains(errStr, "permission denied") || strings.Contains(errStr, "operation not permitted")) {
t.Errorf("ImageRemove error not an permission error %s", errStr)
}
// Verify that layer remaining on disk // Verify that layer remaining on disk
dir, _ := os.Stat(data["UpperDir"]) dir, _ := os.Stat(data["UpperDir"])