[bugfix] Fix writes to global config from tests (#2727)

* [bugfix] Fix writes to global config from tests Fixes #2725 Signed-off-by: Dominik Schulz <[email protected]> * Shorten readonly config creation. Signed-off-by: Dominik Schulz <[email protected]> * Address review comments Signed-off-by: Dominik Schulz <[email protected]> --------- Signed-off-by: Dominik Schulz <[email protected]>
gopasspw · Dec 1, 2023 · 263b781 · 263b781
1 parent bf426e6
commit 263b781
Show file tree

Hide file tree

Showing 108 changed files with 340 additions and 319 deletions.
diff --git a/internal/action/action_test.go b/internal/action/action_test.go
@@ -20,7 +20,7 @@ import (
 )
 
 func newMock(ctx context.Context, path string) (*Action, error) {
-	cfg := config.NewNoWrites()
+	cfg := config.NewInMemory()
 	if err := cfg.SetPath(path); err != nil {
 		return nil, err
 	}
@@ -48,7 +48,7 @@ func newMock(ctx context.Context, path string) (*Action, error) {
 func TestAction(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithInteractive(ctx, false)
 
 	act, err := newMock(ctx, u.StoreDir(""))
@@ -73,7 +73,7 @@ func TestNew(t *testing.T) {
 	assert.NotNil(t, u)
 
 	td := t.TempDir()
-	cfg := config.NewNoWrites()
+	cfg := config.NewInMemory()
 	sv := semver.Version{}
 
 	t.Run("init a new store", func(t *testing.T) {

diff --git a/internal/action/aliases_test.go b/internal/action/aliases_test.go
@@ -2,10 +2,10 @@ package action
 
 import (
 	"bytes"
-	"context"
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/tests/gptest"
@@ -15,7 +15,7 @@ import (
 func TestAliases(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithHidden(ctx, true)
 	act, err := newMock(ctx, u.StoreDir(""))

diff --git a/internal/action/audit_test.go b/internal/action/audit_test.go
@@ -2,10 +2,10 @@ package action
 
 import (
 	"bytes"
-	"context"
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/gopass/secrets"
@@ -17,7 +17,7 @@ import (
 func TestAudit(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithHidden(ctx, true)
 	act, err := newMock(ctx, u.StoreDir(""))

diff --git a/internal/action/binary_test.go b/internal/action/binary_test.go
@@ -3,12 +3,12 @@ package action
 import (
 	"bufio"
 	"bytes"
-	"context"
 	"math/rand"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/tests/gptest"
@@ -19,7 +19,7 @@ import (
 func TestBinary(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithHidden(ctx, true)
 
@@ -45,7 +45,7 @@ func TestBinaryCat(t *testing.T) {
 
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithHidden(ctx, true)
 
@@ -100,7 +100,7 @@ func TestBinaryCat(t *testing.T) {
 func TestBinaryCatSizes(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithHidden(ctx, true)
 
@@ -154,7 +154,7 @@ func TestBinaryCatSizes(t *testing.T) {
 func TestBinaryCopy(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithHidden(ctx, true)
 
@@ -216,7 +216,7 @@ func TestBinaryCopy(t *testing.T) {
 func TestBinarySum(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithHidden(ctx, true)
 
@@ -247,7 +247,7 @@ func TestBinarySum(t *testing.T) {
 func TestBinaryGet(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithHidden(ctx, true)
 

diff --git a/internal/action/clone_test.go b/internal/action/clone_test.go
@@ -43,7 +43,7 @@ func aGitRepo(ctx context.Context, t *testing.T, u *gptest.Unit, name string) st
 func TestClone(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithInteractive(ctx, false)
 	ctx = backend.WithStorageBackend(ctx, backend.GitFS)
@@ -94,11 +94,11 @@ func TestCloneBackendIsStoredForMount(t *testing.T) {
 		stdout = os.Stdout
 	}()
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithInteractive(ctx, false)
 
-	cfg := config.NewNoWrites()
+	cfg := config.NewInMemory()
 	require.NoError(t, cfg.SetPath(u.StoreDir("")))
 
 	act, err := newAction(cfg, semver.Version{}, false)
@@ -125,7 +125,7 @@ func TestCloneGetGitConfig(t *testing.T) {
 	r2 := gptest.UnsetVars(termio.EmailVars...)
 	defer r2()
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithInteractive(ctx, false)
 
@@ -153,11 +153,11 @@ func TestCloneCheckDecryptionKeys(t *testing.T) {
 		stdout = os.Stdout
 	}()
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithInteractive(ctx, false)
 
-	cfg := config.NewNoWrites()
+	cfg := config.NewInMemory()
 	require.NoError(t, cfg.SetPath(u.StoreDir("")))
 
 	act, err := newAction(cfg, semver.Version{}, false)

diff --git a/internal/action/commands_test.go b/internal/action/commands_test.go
@@ -1,9 +1,9 @@
 package action
 
 import (
-	"context"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/tests/gptest"
 	"github.com/stretchr/testify/assert"
@@ -40,7 +40,7 @@ func testCommand(t *testing.T, cmd *cli.Command) {
 func TestCommands(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithInteractive(ctx, false)
 	act, err := newMock(ctx, u.StoreDir(""))
 	require.NoError(t, err)

diff --git a/internal/action/completion_test.go b/internal/action/completion_test.go
@@ -2,10 +2,10 @@ package action
 
 import (
 	"bytes"
-	"context"
 	"os"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/tests/gptest"
@@ -48,7 +48,7 @@ func TestComplete(t *testing.T) {
 		stdout = os.Stdout
 	}()
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithInteractive(ctx, false)
 	act, err := newMock(ctx, u.StoreDir(""))
 	require.NoError(t, err)

diff --git a/internal/action/config_test.go b/internal/action/config_test.go
@@ -2,11 +2,11 @@ package action
 
 import (
 	"bytes"
-	"context"
 	"os"
 	"strings"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/tests/gptest"
@@ -17,7 +17,7 @@ import (
 func TestConfig(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithInteractive(ctx, false)
 	act, err := newMock(ctx, u.StoreDir(""))
 	require.NoError(t, err)

diff --git a/internal/action/context_test.go b/internal/action/context_test.go
@@ -1,14 +1,14 @@
 package action
 
 import (
-	"context"
 	"testing"
 
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestWithClip(t *testing.T) {
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 
 	if IsClip(ctx) {
 		t.Errorf("Should be false")
@@ -20,7 +20,7 @@ func TestWithClip(t *testing.T) {
 }
 
 func TestWithPasswordOnly(t *testing.T) {
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 
 	if IsPasswordOnly(ctx) {
 		t.Errorf("Should be false")
@@ -32,14 +32,14 @@ func TestWithPasswordOnly(t *testing.T) {
 }
 
 func TestWithPrintQR(t *testing.T) {
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 
 	assert.False(t, IsPrintQR(ctx))
 	assert.True(t, IsPrintQR(WithPrintQR(ctx, true)))
 }
 
 func TestWithRevision(t *testing.T) {
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 
 	assert.Equal(t, "", GetRevision(ctx))
 	assert.Equal(t, "foo", GetRevision(WithRevision(ctx, "foo")))
@@ -48,21 +48,21 @@ func TestWithRevision(t *testing.T) {
 }
 
 func TestWithKey(t *testing.T) {
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 
 	assert.Equal(t, "", GetKey(ctx))
 	assert.Equal(t, "foo", GetKey(WithKey(ctx, "foo")))
 }
 
 func TestWithOnlyClip(t *testing.T) {
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 
 	assert.False(t, IsOnlyClip(ctx))
 	assert.True(t, IsOnlyClip(WithOnlyClip(ctx, true)))
 }
 
 func TestWithAlsoClip(t *testing.T) {
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 
 	assert.False(t, IsAlsoClip(ctx))
 	assert.True(t, IsAlsoClip(WithAlsoClip(ctx, true)))

diff --git a/internal/action/convert_test.go b/internal/action/convert_test.go
@@ -2,11 +2,11 @@ package action
 
 import (
 	"bytes"
-	"context"
 	"os"
 	"testing"
 
 	"github.com/fatih/color"
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/gopass/secrets"
@@ -17,7 +17,7 @@ import (
 func TestConvert(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = ctxutil.WithTerminal(ctx, false)
 	ctx = ctxutil.WithInteractive(ctx, false)

diff --git a/internal/action/copy_test.go b/internal/action/copy_test.go
@@ -2,12 +2,12 @@ package action
 
 import (
 	"bytes"
-	"context"
 	"os"
 	"testing"
 
 	"github.com/fatih/color"
 	"github.com/gopasspw/gopass/internal/backend"
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/tests/gptest"
@@ -18,7 +18,7 @@ import (
 func TestCopy(t *testing.T) {
 	u := gptest.NewUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithInteractive(ctx, false)
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 
@@ -100,7 +100,7 @@ func TestCopyGpg(t *testing.T) {
 
 	u := gptest.NewGUnitTester(t)
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithInteractive(ctx, false)
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 	ctx = backend.WithCryptoBackend(ctx, backend.GPGCLI)

diff --git a/internal/action/create_test.go b/internal/action/create_test.go
@@ -2,11 +2,11 @@ package action
 
 import (
 	"bytes"
-	"context"
 	"os"
 	"testing"
 
 	aclip "github.com/atotto/clipboard"
+	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/tests/gptest"
@@ -18,7 +18,7 @@ func TestCreate(t *testing.T) {
 
 	aclip.Unsupported = true
 
-	ctx := context.Background()
+	ctx := config.NewContextInMemory()
 	ctx = ctxutil.WithAlwaysYes(ctx, true)
 
 	act, err := newMock(ctx, u.StoreDir(""))