diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-01-31 09:09:11 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-01-31 16:36:36 +0100 |
commit | 2bbc865f7bb713b2d0d2dbb02b90ae2621ad5367 (patch) | |
tree | cda2d88ec0079293780028d3f0fe699f839777e7 /commands/list_test.go | |
parent | 0792cfa9fae94a06a31e393a46fed3b1dd73b66a (diff) |
commands: Fix config environment handling
Fixes #6503
Fixes #6824
Diffstat (limited to 'commands/list_test.go')
-rw-r--r-- | commands/list_test.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/commands/list_test.go b/commands/list_test.go index bfc280679..6f3d6c74d 100644 --- a/commands/list_test.go +++ b/commands/list_test.go @@ -10,31 +10,27 @@ import ( "testing" qt "github.com/frankban/quicktest" - "github.com/spf13/cobra" ) -func captureStdout(f func() (*cobra.Command, error)) (string, error) { +func captureStdout(f func() error) (string, error) { old := os.Stdout r, w, _ := os.Pipe() os.Stdout = w - _, err := f() - - if err != nil { - return "", err - } + err := f() w.Close() os.Stdout = old var buf bytes.Buffer io.Copy(&buf, r) - return buf.String(), nil + return buf.String(), err } func TestListAll(t *testing.T) { c := qt.New(t) - dir, err := createSimpleTestSite(t, testSiteConfig{}) + dir, clean, err := createSimpleTestSite(t, testSiteConfig{}) + defer clean() c.Assert(err, qt.IsNil) @@ -47,7 +43,10 @@ func TestListAll(t *testing.T) { cmd.SetArgs([]string{"-s=" + dir, "list", "all"}) - out, err := captureStdout(cmd.ExecuteC) + out, err := captureStdout(func() error { + _, err := cmd.ExecuteC() + return err + }) c.Assert(err, qt.IsNil) r := csv.NewReader(strings.NewReader(out)) |