diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2025-01-30 15:29:05 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2025-02-03 16:09:45 +0000 |
| commit | 8f267cefd3660f9d5640ebbbd42e295a61774469 (patch) | |
| tree | 6f0efc247fe55d27f88296517cb3204a8a910cb7 /pkg/rpcserver/rpcserver_test.go | |
| parent | 8f276ef29583e363bb886170f2f424f2d2a0e244 (diff) | |
pkg/rpcserver: run machine check from the global context
Running it from the VM context causes its cancellation each time VM
crashes or the connection is aborted.
Diffstat (limited to 'pkg/rpcserver/rpcserver_test.go')
| -rw-r--r-- | pkg/rpcserver/rpcserver_test.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/rpcserver/rpcserver_test.go b/pkg/rpcserver/rpcserver_test.go index 69379cc98..2da916286 100644 --- a/pkg/rpcserver/rpcserver_test.go +++ b/pkg/rpcserver/rpcserver_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/stretchr/testify/assert" - "golang.org/x/sync/errgroup" "github.com/google/syzkaller/pkg/csource" "github.com/google/syzkaller/pkg/flatrpc" @@ -217,9 +216,8 @@ func TestHandleConn(t *testing.T) { serv.CreateInstance(1, injectExec, nil) go flatrpc.Send(clientConn, tt.req) - var eg errgroup.Group - serv.handleConn(context.Background(), &eg, serverConn) - if err := eg.Wait(); err != nil { + err = serv.handleConn(context.Background(), serverConn) + if err != nil { t.Fatal(err) } }) |