First check for uid 0, then lookup daemon's uid

client_integration_test.go

@@ -646,7 +646,7 @@ func TestClientRename(t *testing.T) {
 	defer sftp.Close()
 
 	dir, err := ioutil.TempDir("", "sftptest-rename")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 	f, err := os.Create(filepath.Join(dir, "old"))
 	require.Nil(t, err)
@@ -835,15 +835,15 @@ func TestClientChown(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	chownto, err := user.Lookup("daemon") // seems common-ish...
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	if usr.Uid != "0" {
 		t.Log("must be root to run chown tests")
 		t.Skip()
 	}
+
+	chownto, err := user.Lookup("daemon") // seems common-ish...
+	if err != nil {
+		t.Fatal(err)
+	}
 	toUID, err := strconv.Atoi(chownto.Uid)
 	if err != nil {
 		t.Fatal(err)
@@ -896,15 +896,15 @@ func TestClientChownReadonly(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	chownto, err := user.Lookup("daemon") // seems common-ish...
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	if usr.Uid != "0" {
 		t.Log("must be root to run chown tests")
 		t.Skip()
 	}
+
+	chownto, err := user.Lookup("daemon") // seems common-ish...
+	if err != nil {
+		t.Fatal(err)
+	}
 	toUID, err := strconv.Atoi(chownto.Uid)
 	if err != nil {
 		t.Fatal(err)