diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2018-04-21 10:47:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-21 10:47:19 -0400 |
| commit | 49d64b9a3b6f5b2f0354fa691ccb9808bda584d9 (patch) | |
| tree | 5bbe04e1437afd85a2cedbbf33cb7a8870572adf /env | |
| parent | 0465ece752b429c611c7628e986bebd984cfe3f6 (diff) | |
Linting subpackages too... (#302)
* Linting subpackages too...
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
* Fixing lint issues
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'env')
| -rw-r--r-- | env/env_test.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/env/env_test.go b/env/env_test.go index 902bd058..a00e77ce 100644 --- a/env/env_test.go +++ b/env/env_test.go @@ -17,8 +17,7 @@ func TestGetenv(t *testing.T) { } func TestGetenvFile(t *testing.T) { - var fs vfs.Filesystem - fs = memfs.Create() + fs := newMemFS() _ = fs.Mkdir("/tmp", 0777) f, _ := vfs.Create(fs, "/tmp/foo") _, _ = f.Write([]byte("foo")) @@ -30,7 +29,7 @@ func TestGetenvFile(t *testing.T) { os.Setenv("FOO_FILE", "/tmp/missing") assert.Equal(t, "bar", GetenvVFS(fs, "FOO", "bar")) - f, _ = vfs.Create(fs, "/tmp/unreadable") + _, _ = vfs.Create(fs, "/tmp/unreadable") fs = WriteOnly(fs) os.Setenv("FOO_FILE", "/tmp/unreadable") assert.Equal(t, "bar", GetenvVFS(fs, "FOO", "bar")) @@ -45,8 +44,7 @@ func TestExpandEnv(t *testing.T) { } func TestExpandEnvFile(t *testing.T) { - var fs vfs.Filesystem - fs = memfs.Create() + fs := newMemFS() _ = fs.Mkdir("/tmp", 0777) f, _ := vfs.Create(fs, "/tmp/foo") _, _ = f.Write([]byte("foo")) @@ -58,7 +56,7 @@ func TestExpandEnvFile(t *testing.T) { os.Setenv("FOO_FILE", "/tmp/missing") assert.Equal(t, "empty", expandEnvVFS(fs, "${FOO}empty")) - f, _ = vfs.Create(fs, "/tmp/unreadable") + _, _ = vfs.Create(fs, "/tmp/unreadable") fs = WriteOnly(fs) os.Setenv("FOO_FILE", "/tmp/unreadable") assert.Equal(t, "", expandEnvVFS(fs, "${FOO}")) @@ -70,6 +68,10 @@ func WriteOnly(fs vfs.Filesystem) vfs.Filesystem { return &WoFS{fs} } +func newMemFS() vfs.Filesystem { + return memfs.Create() +} + type WoFS struct { vfs.Filesystem } |