Increase test coverage (gopasspw#2461)

RELEASE_NOTES=n/a

Signed-off-by: Dominik Schulz <[email protected]>

Signed-off-by: Dominik Schulz <[email protected]>

.golangci.yml

@@ -53,6 +53,7 @@ linters:
   - noctx
   - nolintlint
   - nosnakecase
+  - paralleltest
   - revive
   - rowserrcheck
   - scopelint

Makefile

@@ -97,6 +97,10 @@ fulltest: $(GOPASS_OUTPUT)
 		$(GO) test -run '(Test|Example)' $(BUILDFLAGS) $(TESTFLAGS) -coverprofile=coverage.out -covermode=atomic $(pkg) || exit 1;\
 		tail -n +2 coverage.out >> coverage-all.out;)
 	@$(GO) tool cover -html=coverage-all.out -o coverage-all.html
+	@which go-cover-treemap > /dev/null; if [ $$? -ne 0 ]; then \
+		$(GO) install github.com/nikolaydubina/go-cover-treemap@latest; \
+	fi
+	@go-cover-treemap -coverprofile coverage-all.out > coverage-all.svg
 
 test: $(GOPASS_OUTPUT)
 	@echo ">> TEST, \"fast-mode\": race detector off"

internal/action/action_test.go

@@ -46,10 +46,7 @@ func newMock(ctx context.Context, path string) (*Action, error) {
 }
 
 func TestAction(t *testing.T) {
-	t.Parallel()
-
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	ctx := context.Background()
 	ctx = ctxutil.WithInteractive(ctx, false)
@@ -72,18 +69,16 @@ func TestAction(t *testing.T) {
 }
 
 func TestNew(t *testing.T) {
-	t.Parallel()
-
 	td := t.TempDir()
 	cfg := config.NewNoWrites()
 	sv := semver.Version{}
 
-	t.Run("init a new store", func(t *testing.T) { //nolint:paralleltest
+	t.Run("init a new store", func(t *testing.T) {
 		_, err := New(cfg, sv)
 		require.NoError(t, err)
 	})
 
-	t.Run("init an existing plain store", func(t *testing.T) { //nolint:paralleltest
+	t.Run("init an existing plain store", func(t *testing.T) {
 		require.NoError(t, cfg.SetPath(filepath.Join(td, "store")))
 		assert.NoError(t, os.MkdirAll(cfg.Path(), 0o700))
 		assert.NoError(t, os.WriteFile(filepath.Join(cfg.Path(), plain.IDFile), []byte("foobar"), 0o600))

internal/action/aliases_test.go

@@ -0,0 +1,36 @@
+package action
+
+import (
+	"bytes"
+	"context"
+	"os"
+	"testing"
+
+	"github.com/gopasspw/gopass/internal/out"
+	"github.com/gopasspw/gopass/pkg/ctxutil"
+	"github.com/gopasspw/gopass/tests/gptest"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAliases(t *testing.T) {
+	u := gptest.NewUnitTester(t)
+
+	ctx := context.Background()
+	ctx = ctxutil.WithAlwaysYes(ctx, true)
+	ctx = ctxutil.WithHidden(ctx, true)
+	act, err := newMock(ctx, u.StoreDir(""))
+	require.NoError(t, err)
+	require.NotNil(t, act)
+	ctx = act.cfg.WithConfig(ctx)
+
+	buf := &bytes.Buffer{}
+	out.Stdout = buf
+	stdout = buf
+	defer func() {
+		out.Stdout = os.Stdout
+		stdout = os.Stdout
+	}()
+
+	assert.NoError(t, act.AliasesPrint(gptest.CliCtx(ctx, t)))
+}

internal/action/audit_test.go

@@ -14,9 +14,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestAudit(t *testing.T) { //nolint:paralleltest
+func TestAudit(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	ctx := context.Background()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
@@ -34,7 +33,7 @@ func TestAudit(t *testing.T) { //nolint:paralleltest
 		stdout = os.Stdout
 	}()
 
-	t.Run("expect audit complaints on very weak passwords", func(t *testing.T) { //nolint:paralleltest
+	t.Run("expect audit complaints on very weak passwords", func(t *testing.T) {
 		sec := secrets.NewAKV()
 		sec.SetPassword("123")
 		assert.NoError(t, act.Store.Set(ctx, "bar", sec))
@@ -44,13 +43,13 @@ func TestAudit(t *testing.T) { //nolint:paralleltest
 		buf.Reset()
 	})
 
-	t.Run("test with filter and very passwords", func(t *testing.T) { //nolint:paralleltest
+	t.Run("test with filter and very passwords", func(t *testing.T) {
 		c := gptest.CliCtx(ctx, t, "foo")
 		assert.Error(t, act.Audit(c))
 		buf.Reset()
 	})
 
-	t.Run("test empty store", func(t *testing.T) { //nolint:paralleltest
+	t.Run("test empty store", func(t *testing.T) {
 		for _, v := range []string{"foo", "bar", "baz"} {
 			assert.NoError(t, act.Store.Delete(ctx, v))
 		}

internal/action/binary_test.go

@@ -15,9 +15,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestBinary(t *testing.T) { //nolint:paralleltest
+func TestBinary(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	ctx := context.Background()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
@@ -40,9 +39,8 @@ func TestBinary(t *testing.T) { //nolint:paralleltest
 	assert.Error(t, act.Sum(gptest.CliCtx(ctx, t)))
 }
 
-func TestBinaryCat(t *testing.T) { //nolint:paralleltest
+func TestBinaryCat(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	ctx := context.Background()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
@@ -64,16 +62,16 @@ func TestBinaryCat(t *testing.T) { //nolint:paralleltest
 	infile := filepath.Join(u.Dir, "input.txt")
 	writeBinfile(t, infile)
 
-	t.Run("populate store", func(t *testing.T) { //nolint:paralleltest
+	t.Run("populate store", func(t *testing.T) {
 		assert.NoError(t, act.binaryCopy(ctx, gptest.CliCtx(ctx, t), infile, "bar", true))
 	})
 
-	t.Run("binary cat bar", func(t *testing.T) { //nolint:paralleltest
+	t.Run("binary cat bar", func(t *testing.T) {
 		assert.NoError(t, act.Cat(gptest.CliCtx(ctx, t, "bar")))
 	})
 
 	stdinfile := filepath.Join(u.Dir, "stdin")
-	t.Run("binary cat baz from stdin", func(t *testing.T) { //nolint:paralleltest
+	t.Run("binary cat baz from stdin", func(t *testing.T) {
 		writeBinfile(t, stdinfile)
 
 		fd, err := os.Open(stdinfile)
@@ -87,7 +85,7 @@ func TestBinaryCat(t *testing.T) { //nolint:paralleltest
 		assert.NoError(t, act.Cat(gptest.CliCtx(ctx, t, "baz")))
 	})
 
-	t.Run("compare output", func(t *testing.T) { //nolint:paralleltest
+	t.Run("compare output", func(t *testing.T) {
 		buf, err := os.ReadFile(stdinfile)
 		require.NoError(t, err)
 		sec, err := act.binaryGet(ctx, "baz")
@@ -96,9 +94,8 @@ func TestBinaryCat(t *testing.T) { //nolint:paralleltest
 	})
 }
 
-func TestBinaryCopy(t *testing.T) { //nolint:paralleltest
+func TestBinaryCopy(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	ctx := context.Background()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
@@ -115,7 +112,7 @@ func TestBinaryCopy(t *testing.T) { //nolint:paralleltest
 	require.NotNil(t, act)
 	ctx = act.cfg.WithConfig(ctx)
 
-	t.Run("copy textfile", func(t *testing.T) { //nolint:paralleltest
+	t.Run("copy textfile", func(t *testing.T) {
 		defer buf.Reset()
 
 		infile := filepath.Join(u.Dir, "input.txt")
@@ -125,43 +122,42 @@ func TestBinaryCopy(t *testing.T) { //nolint:paralleltest
 
 	infile := filepath.Join(u.Dir, "input.raw")
 	outfile := filepath.Join(u.Dir, "output.raw")
-	t.Run("copy binary file", func(t *testing.T) { //nolint:paralleltest
+	t.Run("copy binary file", func(t *testing.T) {
 		defer buf.Reset()
 
 		writeBinfile(t, infile)
 		assert.NoError(t, act.binaryCopy(ctx, gptest.CliCtx(ctx, t), infile, "bar", true))
 	})
 
-	t.Run("binary copy bar tempdir/bar", func(t *testing.T) { //nolint:paralleltest
+	t.Run("binary copy bar tempdir/bar", func(t *testing.T) {
 		defer buf.Reset()
 		assert.NoError(t, act.BinaryCopy(gptest.CliCtx(ctx, t, "bar", outfile)))
 	})
 
-	t.Run("binary copy tempdir/bar tempdir/bar", func(t *testing.T) { //nolint:paralleltest
+	t.Run("binary copy tempdir/bar tempdir/bar", func(t *testing.T) {
 		defer buf.Reset()
 
 		assert.Error(t, act.BinaryCopy(gptest.CliCtx(ctx, t, outfile, outfile)))
 	})
 
-	t.Run("binary copy bar bar", func(t *testing.T) { //nolint:paralleltest
+	t.Run("binary copy bar bar", func(t *testing.T) {
 		defer buf.Reset()
 		assert.Error(t, act.BinaryCopy(gptest.CliCtx(ctx, t, "bar", "bar")))
 	})
 
-	t.Run("binary move tempdir/bar bar2", func(t *testing.T) { //nolint:paralleltest
+	t.Run("binary move tempdir/bar bar2", func(t *testing.T) {
 		defer buf.Reset()
 		assert.NoError(t, act.BinaryMove(gptest.CliCtx(ctx, t, outfile, "bar2")))
 	})
 
-	t.Run("binary move bar2 tempdir/bar", func(t *testing.T) { //nolint:paralleltest
+	t.Run("binary move bar2 tempdir/bar", func(t *testing.T) {
 		defer buf.Reset()
 		assert.NoError(t, act.BinaryMove(gptest.CliCtx(ctx, t, "bar2", outfile)))
 	})
 }
 
-func TestBinarySum(t *testing.T) { //nolint:paralleltest
+func TestBinarySum(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	ctx := context.Background()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
@@ -180,20 +176,19 @@ func TestBinarySum(t *testing.T) { //nolint:paralleltest
 
 	infile := filepath.Join(u.Dir, "input.raw")
 
-	t.Run("populate store", func(t *testing.T) { //nolint:paralleltest
+	t.Run("populate store", func(t *testing.T) {
 		writeBinfile(t, infile)
 		assert.NoError(t, act.binaryCopy(ctx, gptest.CliCtx(ctx, t), infile, "bar", true))
 	})
 
-	t.Run("binary sum bar", func(t *testing.T) { //nolint:paralleltest
+	t.Run("binary sum bar", func(t *testing.T) {
 		assert.NoError(t, act.Sum(gptest.CliCtx(ctx, t, "bar")))
 		buf.Reset()
 	})
 }
 
-func TestBinaryGet(t *testing.T) { //nolint:paralleltest
+func TestBinaryGet(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	ctx := context.Background()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)

internal/action/clihelper_test.go

@@ -9,8 +9,6 @@ import (
 )
 
 func TestParseArgs(t *testing.T) {
-	t.Parallel()
-
 	for _, tc := range []struct {
 		name   string
 		argIn  []string
@@ -69,8 +67,6 @@ func TestParseArgs(t *testing.T) {
 		tc := tc
 
 		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
 			if tc.argOut == nil {
 				tc.argOut = argList{}
 			}

internal/action/clone_test.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 
 	"github.com/blang/semver/v4"
@@ -39,9 +40,8 @@ func aGitRepo(ctx context.Context, t *testing.T, u *gptest.Unit, name string) st
 	return gd
 }
 
-func TestClone(t *testing.T) { //nolint:paralleltest
+func TestClone(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	ctx := context.Background()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
@@ -63,27 +63,26 @@ func TestClone(t *testing.T) { //nolint:paralleltest
 		stdout = os.Stdout
 	}()
 
-	t.Run("no args", func(t *testing.T) { //nolint:paralleltest
+	t.Run("no args", func(t *testing.T) {
 		defer buf.Reset()
 		c := gptest.CliCtx(ctx, t)
 		assert.Error(t, act.Clone(c))
 	})
 
-	t.Run("clone to initialized store", func(t *testing.T) { //nolint:paralleltest
+	t.Run("clone to initialized store", func(t *testing.T) {
 		defer buf.Reset()
 		assert.Error(t, act.clone(ctx, "/tmp/non-existing-repo.git", "", filepath.Join(u.Dir, "store")))
 	})
 
-	t.Run("clone to mount", func(t *testing.T) { //nolint:paralleltest
+	t.Run("clone to mount", func(t *testing.T) {
 		defer buf.Reset()
 		gd := aGitRepo(ctx, t, u, "other-repo")
 		assert.NoError(t, act.clone(ctx, gd, "gd", filepath.Join(u.Dir, "mount")))
 	})
 }
 
-func TestCloneBackendIsStoredForMount(t *testing.T) { //nolint:paralleltest
+func TestCloneBackendIsStoredForMount(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	buf := &bytes.Buffer{}
 	out.Stdout = buf
@@ -118,9 +117,8 @@ func TestCloneBackendIsStoredForMount(t *testing.T) { //nolint:paralleltest
 	require.Contains(t, act.cfg.Mounts(), "the-project")
 }
 
-func TestCloneGetGitConfig(t *testing.T) { //nolint:paralleltest
+func TestCloneGetGitConfig(t *testing.T) {
 	u := gptest.NewUnitTester(t)
-	defer u.Remove()
 
 	r1 := gptest.UnsetVars(termio.NameVars...)
 	defer r1()
@@ -141,3 +139,43 @@ func TestCloneGetGitConfig(t *testing.T) { //nolint:paralleltest
 	assert.Equal(t, "0xDEADBEEF", name)
 	assert.Equal(t, "0xDEADBEEF", email)
 }
+
+func TestCloneCheckDecryptionKeys(t *testing.T) {
+	u := gptest.NewUnitTester(t)
+
+	buf := &bytes.Buffer{}
+	out.Stdout = buf
+	out.Stderr = buf
+	stdout = buf
+	defer func() {
+		out.Stdout = os.Stdout
+		out.Stderr = os.Stderr
+		stdout = os.Stdout
+	}()
+
+	ctx := context.Background()
+	ctx = ctxutil.WithAlwaysYes(ctx, true)
+	ctx = ctxutil.WithInteractive(ctx, false)
+
+	cfg := config.NewNoWrites()
+	require.NoError(t, cfg.SetPath(u.StoreDir("")))
+
+	act, err := newAction(cfg, semver.Version{}, false)
+	require.NoError(t, err)
+	require.NotNil(t, act)
+	ctx = act.cfg.WithConfig(ctx)
+
+	c := gptest.CliCtx(ctx, t)
+	require.NoError(t, act.IsInitialized(c))
+
+	repo := aGitRepo(ctx, t, u, "my-project")
+
+	if runtime.GOOS != "linux" {
+		t.Skip("TODO: not working on non-linux builders, yet")
+	}
+
+	c = gptest.CliCtxWithFlags(ctx, t, map[string]string{"check-keys": "true"}, repo, "the-project")
+	assert.NoError(t, act.Clone(c))
+
+	require.Contains(t, act.cfg.Mounts(), "the-project")
+}