fix tests

projectcalico · Feb 27, 2025 · 527ddd0 · 527ddd0
1 parent 24f145f
commit 527ddd0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/guardian/pkg/asyncutil/async.go b/guardian/pkg/asyncutil/async.go
@@ -112,7 +112,7 @@ func NewCommandCoordinator(executors ...ExecutionController) ExecutionController
 // must pause the executor, restart / fix whatever processes need restarting or fixing, then resume execution (using the
 // PauseExecution and ResumeExecution functions). ResumeExecution re runs the commands that failed with EOF.
 func NewCommandExecutor[C any, R any](ctx context.Context, errBuff ErrorBuffer, f func(context.Context, C) (R, error)) CommandExecutor[C, R] {
-	hdlr := &commandExecutor[C, R]{
+	executor := &commandExecutor[C, R]{
 		command:             f,
 		errBuff:             errBuff,
 		cmdChan:             make(chan Command[C, R], 100),
@@ -124,8 +124,8 @@ func NewCommandExecutor[C any, R any](ctx context.Context, errBuff ErrorBuffer,
 		shutdownCompleteSig: NewSignaler(),
 	}
 
-	go hdlr.loop(ctx)
-	return hdlr
+	go executor.loop(ctx)
+	return executor
 }
 
 func (executor *commandExecutor[C, R]) loop(shutdownCtx context.Context) {

diff --git a/guardian/pkg/asyncutil/async_test.go b/guardian/pkg/asyncutil/async_test.go
@@ -18,10 +18,10 @@ func TestRequestHandlerContextCancelledInHungRequest(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	errBuff := asyncutil.NewAsyncErrorBuffer()
+	errBuff := asyncutil.NewErrorBuffer()
 	defer errBuff.Close()
 
-	cmdExec := asyncutil.NewAsyncCommandExecutor(ctx, errBuff, func(ctx context.Context, req any) (any, error) {
+	cmdExec := asyncutil.NewCommandExecutor(ctx, errBuff, func(ctx context.Context, req any) (any, error) {
 		hungChan := make(chan struct{})
 		defer close(hungChan)
 		_, err := asyncutil.ReadWithContext(ctx, hungChan)
@@ -44,13 +44,13 @@ func TestRequestHandlerStopAndRequeue(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	errBuff := asyncutil.NewAsyncErrorBuffer()
+	errBuff := asyncutil.NewErrorBuffer()
 	defer errBuff.Close()
 
 	pause := true
 	var wg sync.WaitGroup
 	wg.Add(2)
-	cmdExec := asyncutil.NewAsyncCommandExecutor(ctx, errBuff, func(ctx context.Context, req any) (any, error) {
+	cmdExec := asyncutil.NewCommandExecutor(ctx, errBuff, func(ctx context.Context, req any) (any, error) {
 		if pause {
 			wg.Done()