From 18eb1d3ab071d9b3b420fec2c0937a84dd51aac2 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Fri, 21 Apr 2023 22:02:43 +0200 Subject: [PATCH] backend: test cleanup --- internal/backend/azure/azure_test.go | 7 +++++-- internal/backend/b2/b2_test.go | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/internal/backend/azure/azure_test.go b/internal/backend/azure/azure_test.go index 9185406f8..0fab5da26 100644 --- a/internal/backend/azure/azure_test.go +++ b/internal/backend/azure/azure_test.go @@ -35,8 +35,11 @@ func newAzureTestSuite(t testing.TB) *test.Suite[azure.Config] { return nil, err } - cfg.AccountName = os.Getenv("RESTIC_TEST_AZURE_ACCOUNT_NAME") - cfg.AccountKey = options.NewSecretString(os.Getenv("RESTIC_TEST_AZURE_ACCOUNT_KEY")) + err = cfg.ApplyEnvironment("RESTIC_TEST_") + if err != nil { + return nil, err + } + cfg.Prefix = fmt.Sprintf("test-%d", time.Now().UnixNano()) return cfg, nil }, diff --git a/internal/backend/b2/b2_test.go b/internal/backend/b2/b2_test.go index 312f9640d..8e982adda 100644 --- a/internal/backend/b2/b2_test.go +++ b/internal/backend/b2/b2_test.go @@ -10,7 +10,6 @@ import ( "github.com/restic/restic/internal/backend" "github.com/restic/restic/internal/backend/b2" "github.com/restic/restic/internal/backend/test" - "github.com/restic/restic/internal/options" "github.com/restic/restic/internal/restic" rtest "github.com/restic/restic/internal/test" @@ -36,8 +35,11 @@ func newB2TestSuite(t testing.TB) *test.Suite[b2.Config] { return nil, err } - cfg.AccountID = os.Getenv("RESTIC_TEST_B2_ACCOUNT_ID") - cfg.Key = options.NewSecretString(os.Getenv("RESTIC_TEST_B2_ACCOUNT_KEY")) + err = cfg.ApplyEnvironment("RESTIC_TEST_") + if err != nil { + return nil, err + } + cfg.Prefix = fmt.Sprintf("test-%d", time.Now().UnixNano()) return cfg, nil },