Skip to content

Commit b8a1c14

Browse files
committed
chore: fix merge orgin/main
1 parent 7159de2 commit b8a1c14

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

enterprise/cli/create_test.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ import (
55
"database/sql"
66
"fmt"
77
"sync"
8+
"sync/atomic"
89
"testing"
910
"time"
1011

12+
"github.com/coder/coder/v2/coderd/wsbuilder"
13+
1114
"github.com/google/uuid"
1215
"github.com/prometheus/client_golang/prometheus"
1316
"github.com/stretchr/testify/assert"
@@ -351,13 +354,20 @@ func TestEnterpriseCreateWithPreset(t *testing.T) {
351354

352355
// Setup Prebuild reconciler
353356
cache := files.New(prometheus.NewRegistry(), &coderdtest.FakeAuthorizer{})
357+
newNoopUsageCheckerPtr := func() *atomic.Pointer[wsbuilder.UsageChecker] {
358+
var noopUsageChecker wsbuilder.UsageChecker = wsbuilder.NoopUsageChecker{}
359+
buildUsageChecker := atomic.Pointer[wsbuilder.UsageChecker]{}
360+
buildUsageChecker.Store(&noopUsageChecker)
361+
return &buildUsageChecker
362+
}
354363
reconciler := prebuilds.NewStoreReconciler(
355364
db, pb, cache,
356365
codersdk.PrebuildsConfig{},
357366
testutil.Logger(t),
358367
quartz.NewMock(t),
359368
prometheus.NewRegistry(),
360369
notifications.NewNoopEnqueuer(),
370+
newNoopUsageCheckerPtr(),
361371
)
362372
var claimer agplprebuilds.Claimer = prebuilds.NewEnterpriseClaimer(db)
363373
api.AGPL.PrebuildsClaimer.Store(&claimer)
@@ -454,13 +464,20 @@ func TestEnterpriseCreateWithPreset(t *testing.T) {
454464

455465
// Setup Prebuild reconciler
456466
cache := files.New(prometheus.NewRegistry(), &coderdtest.FakeAuthorizer{})
467+
newNoopUsageCheckerPtr := func() *atomic.Pointer[wsbuilder.UsageChecker] {
468+
var noopUsageChecker wsbuilder.UsageChecker = wsbuilder.NoopUsageChecker{}
469+
buildUsageChecker := atomic.Pointer[wsbuilder.UsageChecker]{}
470+
buildUsageChecker.Store(&noopUsageChecker)
471+
return &buildUsageChecker
472+
}
457473
reconciler := prebuilds.NewStoreReconciler(
458474
db, pb, cache,
459475
codersdk.PrebuildsConfig{},
460476
testutil.Logger(t),
461477
quartz.NewMock(t),
462478
prometheus.NewRegistry(),
463479
notifications.NewNoopEnqueuer(),
480+
newNoopUsageCheckerPtr(),
464481
)
465482
var claimer agplprebuilds.Claimer = prebuilds.NewEnterpriseClaimer(db)
466483
api.AGPL.PrebuildsClaimer.Store(&claimer)

0 commit comments

Comments
 (0)