From 2d050b85493f15ac75908aff4acae9533c311542 Mon Sep 17 00:00:00 2001
From: Robert Krawitz <rlk@redhat.com>
Date: Mon, 29 Jan 2018 19:30:49 -0500
Subject: [PATCH] Fix race condition in fake runtime test.

---
 pkg/kubelet/remote/BUILD                  | 1 +
 pkg/kubelet/remote/fake/fake_runtime.go   | 3 ++-
 pkg/kubelet/remote/remote_runtime_test.go | 7 ++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkg/kubelet/remote/BUILD b/pkg/kubelet/remote/BUILD
index ad83fa72b9c..33400529adf 100644
--- a/pkg/kubelet/remote/BUILD
+++ b/pkg/kubelet/remote/BUILD
@@ -53,5 +53,6 @@ go_test(
         "//pkg/kubelet/apis/cri/testing:go_default_library",
         "//pkg/kubelet/remote/fake:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
+        "//vendor/github.com/stretchr/testify/require:go_default_library",
     ],
 )
diff --git a/pkg/kubelet/remote/fake/fake_runtime.go b/pkg/kubelet/remote/fake/fake_runtime.go
index 36d8dbfd8fe..292e3c69f6f 100644
--- a/pkg/kubelet/remote/fake/fake_runtime.go
+++ b/pkg/kubelet/remote/fake/fake_runtime.go
@@ -60,7 +60,8 @@ func (f *RemoteRuntime) Start(endpoint string) error {
 		return fmt.Errorf("failed to listen on %q: %v", endpoint, err)
 	}
 
-	return f.server.Serve(l)
+	go f.server.Serve(l)
+	return nil
 }
 
 // Stop stops the fake remote runtime.
diff --git a/pkg/kubelet/remote/remote_runtime_test.go b/pkg/kubelet/remote/remote_runtime_test.go
index 2f26efc3da0..879431758d3 100644
--- a/pkg/kubelet/remote/remote_runtime_test.go
+++ b/pkg/kubelet/remote/remote_runtime_test.go
@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
 	apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing"
 	fakeremote "k8s.io/kubernetes/pkg/kubelet/remote/fake"
@@ -35,17 +36,17 @@ const (
 // Users should call fakeRuntime.Stop() to cleanup the server.
 func createAndStartFakeRemoteRuntime(t *testing.T) (*fakeremote.RemoteRuntime, string) {
 	endpoint, err := fakeremote.GenerateEndpoint()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	fakeRuntime := fakeremote.NewFakeRemoteRuntime()
-	go fakeRuntime.Start(endpoint)
+	fakeRuntime.Start(endpoint)
 
 	return fakeRuntime, endpoint
 }
 
 func createRemoteRuntimeService(endpoint string, t *testing.T) internalapi.RuntimeService {
 	runtimeService, err := NewRemoteRuntimeService(endpoint, defaultConnectionTimeout)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	return runtimeService
 }