Rewrite tests.

Signed-off-by: Felix Fontein <felix@fontein.de>

Author: felixfontein

age/keysource.go

@@ -24,9 +24,9 @@ const (
 	// age keys file.
 	SopsAgeKeyFileEnv = "SOPS_AGE_KEY_FILE"
 	// SopsAgeKeyUserConfigPath is the default age keys file path in
-	// os.UserConfigDir.
+	// getUserConfigDir().
 	SopsAgeKeyUserConfigPath = "sops/age/keys.txt"
-	// On macOS, ignores os.UserConfigDir(). So we handle that manually.
+	// On macOS, os.UserConfigDir() ignores XDG_CONFIG_HOME. So we handle that manually.
 	xdgConfigHome = "XDG_CONFIG_HOME"
 )
 

age/keysource_test.go

@@ -387,14 +387,16 @@ func overwriteUserConfigDir(t *testing.T, path string) {
 	}
 }
 
+// Make sure that on all supported platforms but Windows, XDG_CONFIG_HOME
+// can be used to specify the user's home directory. For most platforms
+// this is handled by Go's os.UserConfigDir(), but for Darwin our code
+// in getUserConfigDir() handles this explicitly.
 func TestUserConfigDir(t *testing.T) {
-	const dir = "/test/home/dir"
-	overwriteUserConfigDir(t, dir)
-	expectedDir := dir
-	if runtime.GOOS == "plan9" {
-		expectedDir += "/lib"
+	if runtime.GOOS != "windows" {
+		const dir = "/test/home/dir"
+		t.Setenv("XDG_CONFIG_HOME", dir)
+		home, err := getUserConfigDir()
+		assert.Nil(t, err)
+		assert.Equal(t, home, dir)
 	}
-	home, err := getUserConfigDir()
-	assert.Nil(t, err)
-	assert.Equal(t, home, dir)
 }