Issue #2362 Check for username/uid for permission test

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 build:
-  image: registry.centos.org/gbraad/minishift-build:latest
+  image: registry.centos.org/minishift/minishift-build:latest
   tags:
     - docker
   script:

pkg/util/utils.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/user"
 	"path/filepath"
 	"strings"
 	"time"
@@ -195,3 +196,14 @@ func IsDirectoryWritable(path string) bool {
 
 	return true
 }
+
+// IsAdministrativeUser returns true when user is either root or
+// Administrator
+func IsAdministrativeUser() bool {
+	u, _ := user.Current()
+	username := strings.ToLower(u.Username)
+
+	return u.Uid == "1" ||
+		username == "root" ||
+		strings.Contains(username, "administrator")
+}

pkg/util/utils_test.go

@@ -19,8 +19,10 @@ package util
 import (
 	"fmt"
 	"os"
+	"os/user"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"testing"
 	"time"
 
@@ -217,8 +219,9 @@ func TestWritableDirectory(t *testing.T) {
 }
 
 func TestNonWritableDirectory(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("Skipping as Appveyor CI is running in administrator mode")
+	if isAppVeyorUser() ||
+		IsAdministrativeUser() {
+		t.Skip("Skipping as CI runs as root or administrator")
 	}
 
 	testDir, err := ioutil.TempDir("", "minishift-test-")
@@ -227,4 +230,11 @@ func TestNonWritableDirectory(t *testing.T) {
 
 	os.Chmod(testDir, 0400) // make dir read-only
 	assert.False(t, IsDirectoryWritable(testDir))
+
+}
+
+func isAppVeyorUser() bool {
+	// Checking for $env:APPVEYOR does not work !
+	u, _ := user.Current()
+	return strings.Contains(u.Username, "appveyor")
 }