Skip to content

Commit 687d39e

Browse files
author
Shreyansh Sancheti
committed
controller/vm: use context.Background() for Go 1.23 compat
CI uses oldstable (Go 1.23). t.Context() requires Go 1.24. Signed-off-by: Shreyansh Sancheti <shreyanshjain7174@gmail.com> Signed-off-by: Shreyansh Sancheti <shsancheti@microsoft.com>
1 parent 4a1371d commit 687d39e

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

internal/controller/vm/vm_test.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package vm_test
44

55
import (
6+
"context"
67
"errors"
78
"strings"
89
"testing"
@@ -106,7 +107,7 @@ func TestTerminateVM(t *testing.T) {
106107
tt.setupMock(mockUVM, mockGuest)
107108
}
108109

109-
err := m.TerminateVM(t.Context())
110+
err := m.TerminateVM(context.Background())
110111

111112
if tt.expectError {
112113
if err == nil {
@@ -134,35 +135,35 @@ func TestGuardChecks(t *testing.T) {
134135
errorContains string
135136
}{
136137
{"ExecIntoHost/NotCreated", vm.StateNotCreated, func(m *vm.Manager) error {
137-
_, err := m.ExecIntoHost(t.Context(), &shimdiag.ExecProcessRequest{Args: []string{"ls"}})
138+
_, err := m.ExecIntoHost(context.Background(), &shimdiag.ExecProcessRequest{Args: []string{"ls"}})
138139
return err
139140
}, "incorrect state"},
140141
{"ExecIntoHost/Created", vm.StateCreated, func(m *vm.Manager) error {
141-
_, err := m.ExecIntoHost(t.Context(), &shimdiag.ExecProcessRequest{Args: []string{"ls"}})
142+
_, err := m.ExecIntoHost(context.Background(), &shimdiag.ExecProcessRequest{Args: []string{"ls"}})
142143
return err
143144
}, "incorrect state"},
144145
{"ExecIntoHost/Terminated", vm.StateTerminated, func(m *vm.Manager) error {
145-
_, err := m.ExecIntoHost(t.Context(), &shimdiag.ExecProcessRequest{Args: []string{"ls"}})
146+
_, err := m.ExecIntoHost(context.Background(), &shimdiag.ExecProcessRequest{Args: []string{"ls"}})
146147
return err
147148
}, "incorrect state"},
148149
{"DumpStacks/NotCreated", vm.StateNotCreated, func(m *vm.Manager) error {
149-
_, err := m.DumpStacks(t.Context())
150+
_, err := m.DumpStacks(context.Background())
150151
return err
151152
}, "incorrect state"},
152153
{"DumpStacks/Terminated", vm.StateTerminated, func(m *vm.Manager) error {
153-
_, err := m.DumpStacks(t.Context())
154+
_, err := m.DumpStacks(context.Background())
154155
return err
155156
}, "incorrect state"},
156157
{"Stats/NotCreated", vm.StateNotCreated, func(m *vm.Manager) error {
157-
_, err := m.Stats(t.Context())
158+
_, err := m.Stats(context.Background())
158159
return err
159160
}, "incorrect state"},
160161
{"Stats/Created", vm.StateCreated, func(m *vm.Manager) error {
161-
_, err := m.Stats(t.Context())
162+
_, err := m.Stats(context.Background())
162163
return err
163164
}, "incorrect state"},
164165
{"Wait/NotCreated", vm.StateNotCreated, func(m *vm.Manager) error {
165-
return m.Wait(t.Context())
166+
return m.Wait(context.Background())
166167
}, "incorrect state"},
167168
{"ExitStatus/NotCreated", vm.StateNotCreated, func(m *vm.Manager) error {
168169
_, err := m.ExitStatus()
@@ -250,7 +251,7 @@ func TestExecIntoHost(t *testing.T) {
250251
tt.setupMock(mockGuest)
251252
}
252253

253-
exitCode, err := m.ExecIntoHost(t.Context(), tt.request)
254+
exitCode, err := m.ExecIntoHost(context.Background(), tt.request)
254255

255256
if tt.expectError {
256257
if err == nil {
@@ -308,7 +309,7 @@ func TestDumpStacks(t *testing.T) {
308309
mockGuest.EXPECT().DumpStacks(gomock.Any()).Return(tt.expectResult, tt.dumpError)
309310
}
310311

311-
result, err := m.DumpStacks(t.Context())
312+
result, err := m.DumpStacks(context.Background())
312313

313314
if tt.expectError {
314315
if err == nil {
@@ -399,7 +400,7 @@ func TestStartVM_IdempotentWhenRunning(t *testing.T) {
399400
defer ctrl.Finish()
400401
m, _, _ := newTestManager(t, ctrl, vm.StateRunning)
401402

402-
err := m.StartVM(t.Context(), &vm.StartOptions{})
403+
err := m.StartVM(context.Background(), &vm.StartOptions{})
403404
if err != nil {
404405
t.Fatalf("expected nil for idempotent StartVM, got: %v", err)
405406
}
@@ -425,7 +426,7 @@ func TestStartVM_ErrorWhenNotCreated(t *testing.T) {
425426
defer ctrl.Finish()
426427
m, _, _ := newTestManager(t, ctrl, tt.state)
427428

428-
err := m.StartVM(t.Context(), &vm.StartOptions{})
429+
err := m.StartVM(context.Background(), &vm.StartOptions{})
429430
if err == nil {
430431
t.Errorf("expected error for StartVM in state %v", tt.state)
431432
}

0 commit comments

Comments
 (0)