fs_test: use os.Getuid() instead user.Current() to determine if a test is executed with root privileges.

This change lower the expectations on test env setup, i.e. tests could be executed in a container under a random UID,
without require an user in /etc/passwd

Signed-off-by: Predrag Knezevic <pknezevi@redhat.com>
pull/7147/head
Predrag Knezevic 5 years ago
parent e062146db3
commit b83d3d415c

@ -35,7 +35,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
"os/user"
"path/filepath" "path/filepath"
"runtime" "runtime"
"sync" "sync"
@ -175,13 +174,9 @@ func TestCopyDirFail_SrcInaccessible(t *testing.T) {
t.Skip("skipping on windows") t.Skip("skipping on windows")
} }
var currentUser, err = user.Current() var currentUID = os.Getuid()
if err != nil { if currentUID == 0 {
t.Fatalf("Failed to get name of current user: %s", err)
}
if currentUser.Name == "root" {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
t.Skip("Skipping for root user") t.Skip("Skipping for root user")
} }
@ -214,13 +209,9 @@ func TestCopyDirFail_DstInaccessible(t *testing.T) {
t.Skip("skipping on windows") t.Skip("skipping on windows")
} }
var currentUser, err = user.Current() var currentUID = os.Getuid()
if err != nil { if currentUID == 0 {
t.Fatalf("Failed to get name of current user: %s", err)
}
if currentUser.Name == "root" {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
t.Skip("Skipping for root user") t.Skip("Skipping for root user")
} }
@ -314,13 +305,9 @@ func TestCopyDirFailOpen(t *testing.T) {
t.Skip("skipping on windows") t.Skip("skipping on windows")
} }
var currentUser, err = user.Current() var currentUID = os.Getuid()
if err != nil {
t.Fatalf("Failed to get name of current user: %s", err)
}
if currentUser.Name == "root" { if currentUID == 0 {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
t.Skip("Skipping for root user") t.Skip("Skipping for root user")
} }
@ -483,13 +470,9 @@ func TestCopyFileFail(t *testing.T) {
t.Skip("skipping on windows") t.Skip("skipping on windows")
} }
var currentUser, err = user.Current() var currentUID = os.Getuid()
if err != nil { if currentUID == 0 {
t.Fatalf("Failed to get name of current user: %s", err)
}
if currentUser.Name == "root" {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
t.Skip("Skipping for root user") t.Skip("Skipping for root user")
} }
@ -574,13 +557,9 @@ func setupInaccessibleDir(t *testing.T, op func(dir string) error) func() {
func TestIsDir(t *testing.T) { func TestIsDir(t *testing.T) {
var currentUser, err = user.Current() var currentUID = os.Getuid()
if err != nil { if currentUID == 0 {
t.Fatalf("Failed to get name of current user: %s", err)
}
if currentUser.Name == "root" {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
t.Skip("Skipping for root user") t.Skip("Skipping for root user")
} }
@ -631,13 +610,9 @@ func TestIsDir(t *testing.T) {
func TestIsSymlink(t *testing.T) { func TestIsSymlink(t *testing.T) {
var currentUser, err = user.Current() var currentUID = os.Getuid()
if err != nil {
t.Fatalf("Failed to get name of current user: %s", err)
}
if currentUser.Name == "root" { if currentUID == 0 {
// Skipping if root, because all files are accessible // Skipping if root, because all files are accessible
t.Skip("Skipping for root user") t.Skip("Skipping for root user")
} }

Loading…
Cancel
Save