Increase code coverage (gopasspw#601)

store/sub/fsck_test.go

@@ -1,11 +1,13 @@
 package sub
 
 import (
+	"bytes"
 	"context"
 	"io/ioutil"
 	"os"
 	"testing"
 
+	"github.com/justwatchcom/gopass/utils/out"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -20,6 +22,12 @@ func TestFsck(t *testing.T) {
 		_ = os.RemoveAll(tempdir)
 	}()
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	s, err := createSubStore(tempdir)
 	assert.NoError(t, err)
 

store/sub/git_test.go

@@ -23,6 +23,9 @@ func TestGit(t *testing.T) {
 	s, err := createSubStore(tempdir)
 	assert.NoError(t, err)
 
+	assert.Error(t, s.Git(ctx, "status"))
+	assert.Error(t, s.GitPush(ctx, "origin", "master"))
+
 	t.Skip("flaky")
 	assert.NoError(t, s.GitInit(ctx, "", "", ""))
 	assert.NoError(t, s.Git(ctx, "status"))

store/sub/gpg_test.go

@@ -1,11 +1,13 @@
 package sub
 
 import (
+	"bytes"
 	"context"
 	"io/ioutil"
 	"os"
 	"testing"
 
+	"github.com/justwatchcom/gopass/utils/out"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -20,6 +22,12 @@ func TestGPG(t *testing.T) {
 		_ = os.RemoveAll(tempdir)
 	}()
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	s, err := createSubStore(tempdir)
 	assert.NoError(t, err)
 

store/sub/list_test.go

@@ -1,21 +1,28 @@
 package sub
 
 import (
+	"bytes"
 	"context"
 	"io/ioutil"
 	"os"
-	"strings"
 	"testing"
 
 	gitmock "github.com/justwatchcom/gopass/backend/git/mock"
 	gpgmock "github.com/justwatchcom/gopass/backend/gpg/mock"
 	"github.com/justwatchcom/gopass/store/secret"
+	"github.com/justwatchcom/gopass/utils/out"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestList(t *testing.T) {
 	ctx := context.Background()
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	for _, tc := range []struct {
 		name string
 		prep func(s *Store) error
@@ -24,6 +31,7 @@ func TestList(t *testing.T) {
 		{
 			name: "Empty store",
 			prep: func(s *Store) error { return nil },
+			out:  []string{},
 		},
 		{
 			name: "Single entry",
@@ -80,13 +88,10 @@ func TestList(t *testing.T) {
 
 		// run test case
 		out, err := s.List("")
-		if err != nil {
-			t.Fatalf("Failed to call List(): %s", err)
-		}
-		t.Logf("Output: %s", out)
-		if strings.Join(out, "\n") != strings.Join(tc.out, "\n") {
-			t.Errorf("Mismatched output: %+v vs. %+v", out, tc.out)
-		}
+		assert.NoError(t, err)
+		assert.Equal(t, tc.out, out)
+
+		obuf.Reset()
 
 		// common tear down
 		_ = os.RemoveAll(tempdir)

store/sub/move_test.go

@@ -1,6 +1,7 @@
 package sub
 
 import (
+	"bytes"
 	"context"
 	"io/ioutil"
 	"os"
@@ -9,12 +10,19 @@ import (
 	gitmock "github.com/justwatchcom/gopass/backend/git/mock"
 	gpgmock "github.com/justwatchcom/gopass/backend/gpg/mock"
 	"github.com/justwatchcom/gopass/store/secret"
+	"github.com/justwatchcom/gopass/utils/out"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestCopy(t *testing.T) {
 	ctx := context.Background()
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	for _, tc := range []struct {
 		name string
 		tf   func(s *Store) func(t *testing.T)
@@ -62,7 +70,6 @@ func TestCopy(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Failed to create tempdir: %s", err)
 		}
-		t.Logf("Using tempdir: %s", tempdir)
 
 		s := &Store{
 			alias: "",
@@ -77,6 +84,7 @@ func TestCopy(t *testing.T) {
 		// run test case
 		t.Run(tc.name, tc.tf(s))
 
+		obuf.Reset()
 		// common tear down
 		_ = os.RemoveAll(tempdir)
 	}
@@ -85,6 +93,12 @@ func TestCopy(t *testing.T) {
 func TestMove(t *testing.T) {
 	ctx := context.Background()
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	for _, tc := range []struct {
 		name string
 		tf   func(s *Store) func(t *testing.T)
@@ -143,6 +157,7 @@ func TestMove(t *testing.T) {
 		// run test case
 		t.Run(tc.name, tc.tf(s))
 
+		obuf.Reset()
 		// common tear down
 		_ = os.RemoveAll(tempdir)
 	}
@@ -151,6 +166,12 @@ func TestMove(t *testing.T) {
 func TestDelete(t *testing.T) {
 	ctx := context.Background()
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	for _, tc := range []struct {
 		name string
 		tf   func(s *Store) func(t *testing.T)
@@ -202,6 +223,7 @@ func TestDelete(t *testing.T) {
 		// run test case
 		t.Run(tc.name, tc.tf(s))
 
+		obuf.Reset()
 		// common tear down
 		_ = os.RemoveAll(tempdir)
 	}
@@ -210,6 +232,12 @@ func TestDelete(t *testing.T) {
 func TestPrune(t *testing.T) {
 	ctx := context.Background()
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	for _, tc := range []struct {
 		name string
 		tf   func(s *Store) func(t *testing.T)
@@ -292,6 +320,7 @@ func TestPrune(t *testing.T) {
 		// run test case
 		t.Run(tc.name, tc.tf(s))
 
+		obuf.Reset()
 		// common tear down
 		_ = os.RemoveAll(tempdir)
 	}

store/sub/recipients_test.go

@@ -13,6 +13,7 @@ import (
 
 	gitmock "github.com/justwatchcom/gopass/backend/git/mock"
 	gpgmock "github.com/justwatchcom/gopass/backend/gpg/mock"
+	"github.com/justwatchcom/gopass/utils/out"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -27,6 +28,12 @@ func TestGetRecipientsDefault(t *testing.T) {
 		_ = os.RemoveAll(tempdir)
 	}()
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	genRecs, _, err := createStore(tempdir, nil, nil)
 	assert.NoError(t, err)
 
@@ -50,7 +57,13 @@ func TestGetRecipientsSubID(t *testing.T) {
 		t.Fatalf("Failed to create tempdir: %s", err)
 	}
 	defer func() {
-		//_ = os.RemoveAll(tempdir)
+		_ = os.RemoveAll(tempdir)
+	}()
+
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
 	}()
 
 	genRecs, _, err := createStore(tempdir, nil, nil)
@@ -88,6 +101,12 @@ func TestSaveRecipients(t *testing.T) {
 	_, _, err = createStore(tempdir, nil, nil)
 	assert.NoError(t, err)
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	recp := []string{"john.doe"}
 	s := &Store{
 		alias: "",
@@ -127,6 +146,7 @@ func TestSaveRecipients(t *testing.T) {
 
 func TestAddRecipient(t *testing.T) {
 	ctx := context.Background()
+	ctx = out.WithHidden(ctx, true)
 
 	tempdir, err := ioutil.TempDir("", "gopass-")
 	if err != nil {
@@ -139,6 +159,12 @@ func TestAddRecipient(t *testing.T) {
 	genRecs, _, err := createStore(tempdir, nil, nil)
 	assert.NoError(t, err)
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	s := &Store{
 		alias: "",
 		path:  tempdir,
@@ -161,6 +187,7 @@ func TestAddRecipient(t *testing.T) {
 
 func TestRemoveRecipient(t *testing.T) {
 	ctx := context.Background()
+	ctx = out.WithHidden(ctx, true)
 
 	tempdir, err := ioutil.TempDir("", "gopass-")
 	if err != nil {
@@ -172,6 +199,12 @@ func TestRemoveRecipient(t *testing.T) {
 	_, _, err = createStore(tempdir, nil, nil)
 	assert.NoError(t, err)
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	s := &Store{
 		alias: "",
 		path:  tempdir,
@@ -201,6 +234,12 @@ func TestListRecipients(t *testing.T) {
 	genRecs, _, err := createStore(tempdir, nil, nil)
 	assert.NoError(t, err)
 
+	obuf := &bytes.Buffer{}
+	out.Stdout = obuf
+	defer func() {
+		out.Stdout = os.Stdout
+	}()
+
 	s := New(
 		"",
 		tempdir,

store/sub/store.go

@@ -151,7 +151,7 @@ func (s *Store) reencrypt(ctx context.Context) error {
 			Total: int64(len(entries)),
 			Width: 120,
 		}
-		if !ctxutil.IsTerminal(ctx) {
+		if !ctxutil.IsTerminal(ctx) || out.IsHidden(ctx) {
 			bar = nil
 		}
 		for _, e := range entries {
@@ -189,6 +189,10 @@ func (s *Store) reencrypt(ctx context.Context) error {
 		return nil
 	}
 
+	return s.reencryptGitPush(ctx)
+}
+
+func (s *Store) reencryptGitPush(ctx context.Context) error {
 	if err := s.git.Push(ctx, "", ""); err != nil {
 		if errors.Cause(err) == store.ErrGitNotInit {
 			msg := "Warning: git is not initialized for this store. Ignoring auto-push option\n" +

utils/completion/fish/completion_test.go

@@ -3,6 +3,7 @@ package fish
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli"
 )
 
@@ -28,8 +29,34 @@ func TestFormatFlag(t *testing.T) {
 func TestGetCompletion(t *testing.T) {
 	app := cli.NewApp()
 	sv, err := GetCompletion(app)
-	if err != nil {
-		t.Fatalf("Error: %s", err)
+	assert.NoError(t, err)
+	assert.Contains(t, sv, "#!/usr/bin/env fish")
+}
+
+func TestFormatflagFunc(t *testing.T) {
+	for _, flag := range []cli.Flag{
+		cli.BoolFlag{Name: "foo", Usage: "bar"},
+		cli.Float64Flag{Name: "foo", Usage: "bar"},
+		cli.GenericFlag{Name: "foo", Usage: "bar"},
+		cli.Int64Flag{Name: "foo", Usage: "bar"},
+		cli.Int64SliceFlag{Name: "foo", Usage: "bar"},
+		cli.IntFlag{Name: "foo", Usage: "bar"},
+		cli.IntSliceFlag{Name: "foo", Usage: "bar"},
+		cli.StringFlag{Name: "foo", Usage: "bar"},
+		cli.StringSliceFlag{Name: "foo", Usage: "bar"},
+		cli.Uint64Flag{Name: "foo", Usage: "bar"},
+		cli.UintFlag{Name: "foo", Usage: "bar"},
+	} {
+		sv, err := formatFlagFunc("short")(flag)
+		assert.NoError(t, err)
+		assert.Equal(t, "", sv)
+
+		sv, err = formatFlagFunc("long")(flag)
+		assert.NoError(t, err)
+		assert.Equal(t, "foo", sv)
+
+		sv, err = formatFlagFunc("usage")(flag)
+		assert.NoError(t, err)
+		assert.Equal(t, "bar", sv)
 	}
-	t.Logf("Output: %s", sv)
 }