From d0faeb539838e250bd0a9db4182d48d4a1915181 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 11 May 2018 14:37:04 +0000 Subject: [PATCH] unix: fix TestSCMCredentials to not fail when root Fixes golang/go#25354 Change-Id: Ic74005ed26792a78354ffe76f567e9a009eabe9a Reviewed-on: https://go-review.googlesource.com/112738 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Tobias Klauser --- unix/creds_test.go | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/unix/creds_test.go b/unix/creds_test.go index cff90010..1b508319 100644 --- a/unix/creds_test.go +++ b/unix/creds_test.go @@ -11,7 +11,6 @@ import ( "go/build" "net" "os" - "syscall" "testing" "golang.org/x/sys/unix" @@ -72,24 +71,10 @@ func TestSCMCredentials(t *testing.T) { defer cli.Close() var ucred unix.Ucred - ucred.Pid = int32(os.Getpid() - 1) + ucred.Pid = int32(os.Getpid()) ucred.Uid = uint32(os.Getuid()) ucred.Gid = uint32(os.Getgid()) oob := unix.UnixCredentials(&ucred) - _, _, err = cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil) - if op, ok := err.(*net.OpError); ok { - err = op.Err - } - if sys, ok := err.(*os.SyscallError); ok { - err = sys.Err - } - if err != syscall.EPERM { - t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) - } - - // Fix the PID. - ucred.Pid = int32(os.Getpid()) - oob = unix.UnixCredentials(&ucred) // On SOCK_STREAM, this is internally going to send a dummy byte n, oobn, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil)