github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Remove redundant sleep from ReRegistration unit test case

Browse Source
This commit is contained in:
vikaschoudhary16 2017-12-24 19:03:53 -05:00
parent 572e276493
commit 5d10dcd983
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/kubelet/cm/deviceplugin/manager_test.go
View File

@ -24,7 +24,6 @@ import (
"reflect" "reflect"
"sync/atomic" "sync/atomic"
"testing" "testing"
"time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -68,36 +67,29 @@ func TestDevicePluginReRegistration(t *testing.T) {
{ID: "Dev3", Health: pluginapi.Healthy}, {ID: "Dev3", Health: pluginapi.Healthy},
} }
callbackCount := 0 expCallbackCount := int32(0)
callbackChan := make(chan int) callbackCount := int32(0)
var stopping int32 callbackChan := make(chan int32)
stopping = 0
callback := func(n string, a, u, r []pluginapi.Device) { callback := func(n string, a, u, r []pluginapi.Device) {
// Should be called three times, one for each plugin registration, till we are stopping. callbackCount++
if callbackCount > 2 && atomic.LoadInt32(&stopping) <= 0 { if callbackCount > atomic.LoadInt32(&expCallbackCount) {
t.FailNow() t.FailNow()
} }
callbackCount++
callbackChan <- callbackCount callbackChan <- callbackCount
} }
m, p1 := setup(t, devs, callback) m, p1 := setup(t, devs, callback)
atomic.StoreInt32(&expCallbackCount, 1)
p1.Register(socketName, testResourceName) p1.Register(socketName, testResourceName)
// Wait for the first callback to be issued. // Wait for the first callback to be issued.
<-callbackChan <-callbackChan
// Wait till the endpoint is added to the manager.
for i := 0; i < 20; i++ {
if len(m.Devices()) > 0 {
break
}
time.Sleep(1)
}
devices := m.Devices() devices := m.Devices()
require.Equal(t, 2, len(devices[testResourceName]), "Devices are not updated.") require.Equal(t, 2, len(devices[testResourceName]), "Devices are not updated.")
p2 := NewDevicePluginStub(devs, pluginSocketName+".new") p2 := NewDevicePluginStub(devs, pluginSocketName+".new")
err := p2.Start() err := p2.Start()
require.NoError(t, err) require.NoError(t, err)
atomic.StoreInt32(&expCallbackCount, 2)
p2.Register(socketName, testResourceName) p2.Register(socketName, testResourceName)
// Wait for the second callback to be issued. // Wait for the second callback to be issued.
<-callbackChan <-callbackChan
@ -109,20 +101,17 @@ func TestDevicePluginReRegistration(t *testing.T) {
p3 := NewDevicePluginStub(devsForRegistration, pluginSocketName+".third") p3 := NewDevicePluginStub(devsForRegistration, pluginSocketName+".third")
err = p3.Start() err = p3.Start()
require.NoError(t, err) require.NoError(t, err)
atomic.StoreInt32(&expCallbackCount, 3)
p3.Register(socketName, testResourceName) p3.Register(socketName, testResourceName)
// Wait for the second callback to be issued. // Wait for the second callback to be issued.
<-callbackChan <-callbackChan
devices3 := m.Devices() devices3 := m.Devices()
require.Equal(t, 1, len(devices3[testResourceName]), "Devices of plugin previously registered should be removed.") require.Equal(t, 1, len(devices3[testResourceName]), "Devices of plugin previously registered should be removed.")
// Wait long enough to catch unexpected callbacks.
time.Sleep(5 * time.Second)
atomic.StoreInt32(&stopping, 1)
p2.Stop() p2.Stop()
p3.Stop() p3.Stop()
cleanup(t, m, p1) cleanup(t, m, p1)
close(callbackChan)
} }
func setup(t *testing.T, devs []*pluginapi.Device, callback monitorCallback) (Manager, *Stub) { func setup(t *testing.T, devs []*pluginapi.Device, callback monitorCallback) (Manager, *Stub) {