diff options
author | Sami Hiltunen <shiltunen@gitlab.com> | 2023-08-22 13:07:31 +0300 |
---|---|---|
committer | Sami Hiltunen <shiltunen@gitlab.com> | 2023-08-31 09:27:27 +0300 |
commit | 644d8262c09ef5436c4b3915f7da98be3c048caa (patch) | |
tree | 1cec8e1876587b6f800576e7b1dfa5bd53c22b0f | |
parent | 20dd1df864d924bfbe6ce33f80310e29e22d9527 (diff) |
Pass logger directly in storage provider tests
StorageProvider tests are first putting the logger in the context
and then extracting it out from there to pass it as a parameter
this is somewhat non-sensical, so pass the logger directly instead.
-rw-r--r-- | internal/praefect/datastore/storage_provider_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/praefect/datastore/storage_provider_test.go b/internal/praefect/datastore/storage_provider_test.go index 7de25e4f5..1c87ca120 100644 --- a/internal/praefect/datastore/storage_provider_test.go +++ b/internal/praefect/datastore/storage_provider_test.go @@ -93,9 +93,9 @@ func TestCachingStorageProvider_GetSyncedNodes(t *testing.T) { t.Run("repository store returns an error", func(t *testing.T) { db.TruncateAll(t) - ctx := testhelper.Context(t, testhelper.ContextWithLogger(testhelper.NewDiscardingLogEntry(t))) + ctx := testhelper.Context(t) - cache, err := NewCachingConsistentStoragesGetter(ctxlogrus.Extract(ctx), rs, []string{"vs"}) + cache, err := NewCachingConsistentStoragesGetter(testhelper.NewLogger(t), rs, []string{"vs"}) require.NoError(t, err) cache.Connected() @@ -114,14 +114,14 @@ func TestCachingStorageProvider_GetSyncedNodes(t *testing.T) { t.Run("cache is disabled after handling invalid payload", func(t *testing.T) { db.TruncateAll(t) - logger := testhelper.NewDiscardingLogEntry(t) - logHook := test.NewLocal(logger.Logger) + logger := testhelper.NewLogger(t) + logHook := test.NewLocal(logger) - ctx := testhelper.Context(t, testhelper.ContextWithLogger(logger)) + ctx := testhelper.Context(t) require.NoError(t, rs.CreateRepository(ctx, 1, "vs", "/repo/path/1", "replica-path", "g1", []string{"g2", "g3"}, nil, true, false)) - cache, err := NewCachingConsistentStoragesGetter(ctxlogrus.Extract(ctx), rs, []string{"vs"}) + cache, err := NewCachingConsistentStoragesGetter(logger, rs, []string{"vs"}) require.NoError(t, err) cache.Connected() |