Skip to content

Commit 5f6efb9

Browse files
authored
Merge pull request #616 from kzys/client-dead-lock
Make TestMultipleVMs_Isolated stable by not sharing its ttrpc client
2 parents 3af01d8 + 4e4bf2b commit 5f6efb9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

runtime/service_integ_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,6 @@ func TestMultipleVMs_Isolated(t *testing.T) {
305305
image, err := alpineImage(testCtx, client, defaultSnapshotterName)
306306
require.NoError(t, err, "failed to get alpine image")
307307

308-
fcClient, err := newFCControlClient(containerdSockPath)
309-
require.NoError(t, err, "failed to create fccontrol client")
310-
311308
cfg, err := config.LoadConfig("")
312309
require.NoError(t, err, "failed to load config")
313310

@@ -357,6 +354,11 @@ func TestMultipleVMs_Isolated(t *testing.T) {
357354
MachineCfg: &proto.FirecrackerMachineConfiguration{MemSizeMib: 1024},
358355
}
359356

357+
fcClient, err := newFCControlClient(containerdSockPath)
358+
if err != nil {
359+
return err
360+
}
361+
360362
resp, createVMErr := fcClient.CreateVM(ctx, req)
361363
if createVMErr != nil {
362364
matches, err := findProcess(ctx, findFirecracker)

0 commit comments

Comments
 (0)