From abeb12c6dfd16e0403e5d17dd7da69632921bdde Mon Sep 17 00:00:00 2001 From: id01 Date: Mon, 13 May 2019 20:05:11 -0700 Subject: [PATCH] lib/env: Make env_test.go support Windows --- lib/env/env_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/env/env_test.go b/lib/env/env_test.go index 0382ecfed..9f601542a 100644 --- a/lib/env/env_test.go +++ b/lib/env/env_test.go @@ -2,6 +2,7 @@ package env import ( "os" + "path/filepath" "testing" homedir "github.com/mitchellh/go-homedir" @@ -20,10 +21,10 @@ func TestShellExpand(t *testing.T) { in, want string }{ {"", ""}, - {"~", home}, - {"~/dir/file.txt", home + "/dir/file.txt"}, - {"/dir/~/file.txt", "/dir/~/file.txt"}, - {"~/${EXPAND_TEST}", home + "/potato"}, + {"~", filepath.FromSlash(home)}, + {filepath.FromSlash("~/dir/file.txt"), filepath.FromSlash(home + "/dir/file.txt")}, + {filepath.FromSlash("/dir/~/file.txt"), filepath.FromSlash("/dir/~/file.txt")}, + {filepath.FromSlash("~/${EXPAND_TEST}"), filepath.FromSlash(home + "/potato")}, } { got := ShellExpand(test.in) assert.Equal(t, test.want, got, test.in)