Merge pull request #616 from kzys/client-dead-lock

Make TestMultipleVMs_Isolated stable by not sharing its ttrpc client

Author: Kazuyoshi Kato

runtime/service_integ_test.go

@@ -305,9 +305,6 @@ func TestMultipleVMs_Isolated(t *testing.T) {
 	image, err := alpineImage(testCtx, client, defaultSnapshotterName)
 	require.NoError(t, err, "failed to get alpine image")
 
-	fcClient, err := newFCControlClient(containerdSockPath)
-	require.NoError(t, err, "failed to create fccontrol client")
-
 	cfg, err := config.LoadConfig("")
 	require.NoError(t, err, "failed to load config")
 
@@ -357,6 +354,11 @@ func TestMultipleVMs_Isolated(t *testing.T) {
 				MachineCfg: &proto.FirecrackerMachineConfiguration{MemSizeMib: 1024},
 			}
 
+			fcClient, err := newFCControlClient(containerdSockPath)
+			if err != nil {
+				return err
+			}
+
 			resp, createVMErr := fcClient.CreateVM(ctx, req)
 			if createVMErr != nil {
 				matches, err := findProcess(ctx, findFirecracker)