Fix broken test-go (main) tests in CI (#40044)
This commit is contained in:
@@ -12,7 +12,6 @@ import (
|
||||
"github.com/fleetdm/fleet/v4/server/activity/api"
|
||||
"github.com/fleetdm/fleet/v4/server/activity/internal/types"
|
||||
platform_authz "github.com/fleetdm/fleet/v4/server/platform/authz"
|
||||
platformlogging "github.com/fleetdm/fleet/v4/server/platform/logging"
|
||||
"github.com/fleetdm/fleet/v4/server/ptr"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
@@ -115,7 +114,7 @@ func setupTest(opts ...func(*testSetup)) *testSetup {
|
||||
for _, opt := range opts {
|
||||
opt(ts)
|
||||
}
|
||||
ts.svc = NewService(ts.authz, ts.ds, ts.providers, slog.New(platformlogging.DiscardHandler{}))
|
||||
ts.svc = NewService(ts.authz, ts.ds, ts.providers, slog.New(slog.DiscardHandler))
|
||||
return ts
|
||||
}
|
||||
|
||||
@@ -483,7 +482,7 @@ func TestStreamActivities(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
newStreamingService := func(ds *mockStreamingDatastore) *Service {
|
||||
return NewService(&mockAuthorizer{}, ds, &mockDataProviders{mockUserProvider: &mockUserProvider{}, mockHostProvider: &mockHostProvider{}}, slog.New(platformlogging.DiscardHandler{}))
|
||||
return NewService(&mockAuthorizer{}, ds, &mockDataProviders{mockUserProvider: &mockUserProvider{}, mockHostProvider: &mockHostProvider{}}, slog.New(slog.DiscardHandler))
|
||||
}
|
||||
|
||||
t.Run("basic streaming", func(t *testing.T) {
|
||||
|
||||
@@ -7,7 +7,6 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/fleetdm/fleet/v4/server/platform/logging"
|
||||
common_mysql "github.com/fleetdm/fleet/v4/server/platform/mysql"
|
||||
mysql_testing_utils "github.com/fleetdm/fleet/v4/server/platform/mysql/testing_utils"
|
||||
kitlog "github.com/go-kit/log"
|
||||
@@ -38,7 +37,7 @@ func SetupTestDB(t *testing.T, testNamePrefix string) *TestDB {
|
||||
|
||||
return &TestDB{
|
||||
DB: db,
|
||||
Logger: slog.New(logging.DiscardHandler{}),
|
||||
Logger: slog.New(slog.DiscardHandler),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user