Fix failing UserId test (#636)

* Fix error check.

* Isolate test.

Withouth this the test will pollute the user's XDG_CONFIG_HOME, potentially overwriting valid data.

* Minor testify usage cleanup.

* Use testify.NoError instead of testify.Nil.

* Fix error check in test.

* Fix directory permission.

Author: tasdomas

iterative/utils/analytics.go

@@ -161,7 +161,7 @@ func GroupId() (string, error) {
 
 func readId(path string) (string, error) {
 	file, err := os.Open(path)
-	if file != nil {
+	if err != nil {
 		return "", err
 	}
 	defer file.Close()
@@ -190,7 +190,7 @@ func readId(path string) (string, error) {
 }
 
 func writeId(path string, id string) error {
-	if err := os.MkdirAll(filepath.Dir(path), 0644); err != nil {
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
 		return err
 	}
 

iterative/utils/analytics_test.go

@@ -13,12 +13,12 @@ import (
 )
 
 func TestVersion(t *testing.T) {
-	assert.Equal(t, Version, "0.0.0")
+	assert.Equal(t, "0.0.0", Version)
 }
 
 func TestTerraformVersion(t *testing.T) {
 	ver, _ := TerraformVersion()
-	assert.Equal(t, strings.HasPrefix(ver, "v"), true)
+	assert.True(t, strings.HasPrefix(ver, "v"))
 }
 
 func TestSystemInfo(t *testing.T) {
@@ -28,6 +28,8 @@ func TestSystemInfo(t *testing.T) {
 }
 
 func TestUserId(t *testing.T) {
+	tempHome := t.TempDir()
+	os.Setenv("XDG_CONFIG_HOME", tempHome)
 	old := appdirs.UserConfigDir("dvc/user_id", "iterative", "", false)
 	new := appdirs.UserConfigDir("iterative/telemetry", "", "", false)
 
@@ -36,18 +38,19 @@ func TestUserId(t *testing.T) {
 		"user_id": userId,
 	}
 	json, _ := json.MarshalIndent(data, "", " ")
+	err := os.MkdirAll(filepath.Dir(old), 0755)
+	assert.NoError(t, err)
+	err = ioutil.WriteFile(old, json, 0644)
+	assert.NoError(t, err)
 
-	_ = os.MkdirAll(filepath.Dir(old), 0644)
-	_ = ioutil.WriteFile(old, json, 0644)
-
-	id, _ := UserId()
-	assert.Equal(t, len(id) == 36, true)
+	id, err := UserId()
+	assert.NoError(t, err)
+	assert.Len(t, id, 36)
 
 	if !IsCI() {
-		assert.Equal(t, userId == id, true)
-
+		assert.Equal(t, userId, id)
 		_, err := os.Stat(new)
-		assert.Equal(t, !os.IsNotExist(err), true)
+		assert.False(t, os.IsNotExist(err))
 	}
 }