From 14f051ef50e26a7624b53d4610e693b37b7de275 Mon Sep 17 00:00:00 2001
From: Brice Rising <brice.rising@slalom.com>
Date: Mon, 10 Dec 2018 14:52:21 -0500
Subject: [PATCH] Fix style issues

Our style settings don't like underscores in variable names, so I switched to camel case. Also, err was unused in some places, so I made an error a fail condition for some test.

Signed-off-by: Brice Rising <brice.rising@slalom.com>
(cherry picked from commit 3d15ec7125bff4a43f4da57225c88c086cbdf108)
---
 pkg/fsutil/fs_test.go | 48 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/pkg/fsutil/fs_test.go b/pkg/fsutil/fs_test.go
index 994683725..a2f0b9fbc 100644
--- a/pkg/fsutil/fs_test.go
+++ b/pkg/fsutil/fs_test.go
@@ -148,9 +148,13 @@ func TestCopyDirFail_SrcInaccessible(t *testing.T) {
 		t.Skip("skipping on windows")
 	}
 
-	var current_user, err = user.Current()
+	var currentUser, err = user.Current()
 
-	if current_user.Name == "root" {
+	if err != nil {
+		t.Fatalf("Failed to get name of current user: %s", err)
+	}
+
+	if currentUser.Name == "root" {
 		// Skipping if root, because all files are accessible
 		t.Skip("Skipping for root user")
 	}
@@ -183,9 +187,13 @@ func TestCopyDirFail_DstInaccessible(t *testing.T) {
 		t.Skip("skipping on windows")
 	}
 
-	var current_user, err = user.Current()
+	var currentUser, err = user.Current()
 
-	if current_user.Name == "root" {
+	if err != nil {
+		t.Fatalf("Failed to get name of current user: %s", err)
+	}
+
+	if currentUser.Name == "root" {
 		// Skipping if root, because all files are accessible
 		t.Skip("Skipping for root user")
 	}
@@ -279,9 +287,13 @@ func TestCopyDirFailOpen(t *testing.T) {
 		t.Skip("skipping on windows")
 	}
 
-	var current_user, err = user.Current()
+	var currentUser, err = user.Current()
+
+	if err != nil {
+		t.Fatalf("Failed to get name of current user: %s", err)
+	}
 
-	if current_user.Name == "root" {
+	if currentUser.Name == "root" {
 		// Skipping if root, because all files are accessible
 		t.Skip("Skipping for root user")
 	}
@@ -444,9 +456,13 @@ func TestCopyFileFail(t *testing.T) {
 		t.Skip("skipping on windows")
 	}
 
-	var current_user, err = user.Current()
+	var currentUser, err = user.Current()
 
-	if current_user.Name == "root" {
+	if err != nil {
+		t.Fatalf("Failed to get name of current user: %s", err)
+	}
+
+	if currentUser.Name == "root" {
 		// Skipping if root, because all files are accessible
 		t.Skip("Skipping for root user")
 	}
@@ -531,9 +547,13 @@ func setupInaccessibleDir(t *testing.T, op func(dir string) error) func() {
 
 func TestIsDir(t *testing.T) {
 
-	var current_user, err = user.Current()
+	var currentUser, err = user.Current()
 
-	if current_user.Name == "root" {
+	if err != nil {
+		t.Fatalf("Failed to get name of current user: %s", err)
+	}
+
+	if currentUser.Name == "root" {
 		// Skipping if root, because all files are accessible
 		t.Skip("Skipping for root user")
 	}
@@ -584,9 +604,13 @@ func TestIsDir(t *testing.T) {
 
 func TestIsSymlink(t *testing.T) {
 
-	var current_user, err = user.Current()
+	var currentUser, err = user.Current()
+
+	if err != nil {
+		t.Fatalf("Failed to get name of current user: %s", err)
+	}
 
-	if current_user.Name == "root" {
+	if currentUser.Name == "root" {
 		// Skipping if root, because all files are accessible
 		t.Skip("Skipping for root user")
 	}