Merge branch 'main' into databranch

kylecarbs · web-flow · commit 645775118a2f · 2022-02-18T10:44:07.000-06:00
diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go
@@ -406,9 +406,9 @@ func createProvisionerDaemonClient(t *testing.T, server provisionerDaemonTestSer
 	err := proto.DRPCRegisterProvisionerDaemon(mux, &server)
 	require.NoError(t, err)
 	srv := drpcserver.New(mux)
+	ctx, cancelFunc := context.WithCancel(context.Background())
+	t.Cleanup(cancelFunc)
 	go func() {
-		ctx, cancelFunc := context.WithCancel(context.Background())
-		t.Cleanup(cancelFunc)
 		_ = srv.Serve(ctx, serverPipe)
 	}()
 	return proto.NewDRPCProvisionerDaemonClient(provisionersdk.Conn(clientPipe))
@@ -426,9 +426,9 @@ func createProvisionerClient(t *testing.T, server provisionerTestServer) sdkprot
 	err := sdkproto.DRPCRegisterProvisioner(mux, &server)
 	require.NoError(t, err)
 	srv := drpcserver.New(mux)
+	ctx, cancelFunc := context.WithCancel(context.Background())
+	t.Cleanup(cancelFunc)
 	go func() {
-		ctx, cancelFunc := context.WithCancel(context.Background())
-		t.Cleanup(cancelFunc)
 		_ = srv.Serve(ctx, serverPipe)
 	}()
 	return sdkproto.NewDRPCProvisionerClient(provisionersdk.Conn(clientPipe))
