github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104959 from calvin0327/issue-test-dataRace

Browse Source 
fix the test issue of node shutdown manager
This commit is contained in:
Kubernetes Prow Robot 2021-09-21 11:56:30 -07:00 committed by GitHub
commit 7c71e06cd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux_test.go
View File

@ -39,6 +39,9 @@ import (
testingclock "k8s.io/utils/clock/testing" testingclock "k8s.io/utils/clock/testing"
) )
// lock is to prevent systemDbus from being modified in the case of concurrency.
var lock sync.Mutex
type fakeDbus struct { type fakeDbus struct {
currentInhibitDelay time.Duration currentInhibitDelay time.Duration
overrideSystemInhibitDelay time.Duration overrideSystemInhibitDelay time.Duration
@ -226,6 +229,8 @@ func TestManager(t *testing.T) {
fakeShutdownChan := make(chan bool) fakeShutdownChan := make(chan bool)
fakeDbus := &fakeDbus{currentInhibitDelay: tc.systemInhibitDelay, shutdownChan: fakeShutdownChan, overrideSystemInhibitDelay: tc.overrideSystemInhibitDelay} fakeDbus := &fakeDbus{currentInhibitDelay: tc.systemInhibitDelay, shutdownChan: fakeShutdownChan, overrideSystemInhibitDelay: tc.overrideSystemInhibitDelay}
lock.Lock()
systemDbus = func() (dbusInhibiter, error) { systemDbus = func() (dbusInhibiter, error) {
return fakeDbus, nil return fakeDbus, nil
} }
@ -238,6 +243,8 @@ func TestManager(t *testing.T) {
manager.clock = testingclock.NewFakeClock(time.Now()) manager.clock = testingclock.NewFakeClock(time.Now())
err := manager.Start() err := manager.Start()
lock.Unlock()
if tc.expectedError != nil { if tc.expectedError != nil {
if !strings.Contains(err.Error(), tc.expectedError.Error()) { if !strings.Contains(err.Error(), tc.expectedError.Error()) {
t.Errorf("unexpected error message. Got: %s want %s", err.Error(), tc.expectedError.Error()) t.Errorf("unexpected error message. Got: %s want %s", err.Error(), tc.expectedError.Error())
@ -341,6 +348,7 @@ func TestRestart(t *testing.T) {
var shutdownChanMut sync.Mutex var shutdownChanMut sync.Mutex
var connChan = make(chan struct{}, 1) var connChan = make(chan struct{}, 1)
lock.Lock()
systemDbus = func() (dbusInhibiter, error) { systemDbus = func() (dbusInhibiter, error) {
defer func() { defer func() {
connChan <- struct{}{} connChan <- struct{}{}
@ -357,6 +365,8 @@ func TestRestart(t *testing.T) {
nodeRef := &v1.ObjectReference{Kind: "Node", Name: "test", UID: types.UID("test"), Namespace: ""} nodeRef := &v1.ObjectReference{Kind: "Node", Name: "test", UID: types.UID("test"), Namespace: ""}
manager, _ := NewManager(fakeRecorder, nodeRef, activePodsFunc, killPodsFunc, syncNodeStatus, shutdownGracePeriodRequested, shutdownGracePeriodCriticalPods) manager, _ := NewManager(fakeRecorder, nodeRef, activePodsFunc, killPodsFunc, syncNodeStatus, shutdownGracePeriodRequested, shutdownGracePeriodCriticalPods)
err := manager.Start() err := manager.Start()
lock.Unlock()
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }