github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race condition in fake runtime test.

Browse Source
This commit is contained in:
Robert Krawitz 2018-01-29 19:30:49 -05:00
parent 29ca36f077
commit 2d050b8549
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/remote/BUILD
View File

@ -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",
],
)

3
pkg/kubelet/remote/fake/fake_runtime.go
View File

@ -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.

7
pkg/kubelet/remote/remote_runtime_test.go
View File

@ -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
}