mirror of
https://github.com/caddyserver/caddy.git
synced 2025-11-11 00:56:56 -05:00
fix windows storage tests
Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
This commit is contained in:
parent
5d50967a0d
commit
05504942d8
@ -57,10 +57,20 @@ func TestHomeDir_CrossPlatform(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "normal HOME set",
|
name: "normal HOME set",
|
||||||
envVars: map[string]string{
|
envVars: map[string]string{
|
||||||
"HOME": "/home/user",
|
"HOME": func() string {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
return "C:\\Users\\user"
|
||||||
|
}
|
||||||
|
return "/home/user"
|
||||||
|
}(),
|
||||||
},
|
},
|
||||||
unsetVars: []string{"HOMEDRIVE", "HOMEPATH", "USERPROFILE", "home"},
|
unsetVars: []string{"HOMEDRIVE", "HOMEPATH", "USERPROFILE", "home"},
|
||||||
expected: "/home/user",
|
expected: func() string {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
return "C:\\Users\\user"
|
||||||
|
}
|
||||||
|
return "/home/user"
|
||||||
|
}(),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "no environment variables",
|
name: "no environment variables",
|
||||||
@ -440,17 +450,30 @@ func TestAppDataDir_Android_SpecialCase(t *testing.T) {
|
|||||||
|
|
||||||
func TestHomeDir_Android_SpecialCase(t *testing.T) {
|
func TestHomeDir_Android_SpecialCase(t *testing.T) {
|
||||||
// Save original environment
|
// Save original environment
|
||||||
originalHOME := os.Getenv("HOME")
|
originalEnv := map[string]string{
|
||||||
|
"HOME": os.Getenv("HOME"),
|
||||||
|
"HOMEDRIVE": os.Getenv("HOMEDRIVE"),
|
||||||
|
"HOMEPATH": os.Getenv("HOMEPATH"),
|
||||||
|
"USERPROFILE": os.Getenv("USERPROFILE"),
|
||||||
|
"home": os.Getenv("home"),
|
||||||
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
if originalHOME == "" {
|
for key, value := range originalEnv {
|
||||||
os.Unsetenv("HOME")
|
if value == "" {
|
||||||
} else {
|
os.Unsetenv(key)
|
||||||
os.Setenv("HOME", originalHOME)
|
} else {
|
||||||
|
os.Setenv(key, value)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// Test Android fallback when HOME is not set
|
// Test Android fallback when HOME is not set
|
||||||
|
// Also unset Windows and Plan9 specific variables
|
||||||
os.Unsetenv("HOME")
|
os.Unsetenv("HOME")
|
||||||
|
os.Unsetenv("HOMEDRIVE")
|
||||||
|
os.Unsetenv("HOMEPATH")
|
||||||
|
os.Unsetenv("USERPROFILE")
|
||||||
|
os.Unsetenv("home")
|
||||||
|
|
||||||
result := HomeDir()
|
result := HomeDir()
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user