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

Merge pull request #106414 from jonyhy96/kubelet-fix-flake

Browse Source 
kubelet: fix npe in test
This commit is contained in:
Kubernetes Prow Robot 2021-11-19 07:06:51 -08:00 committed by GitHub
commit ddfc53922c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/kubelet_test.go
View File

@ -2410,9 +2410,12 @@ func TestSyncLabels(t *testing.T) {
}
for _, action := range actions {
if action.GetVerb() == "patch" {
patchAction := action.(core.PatchActionImpl)
var err error
savedNode, err = applyNodeStatusPatch(test.existingNode, patchAction.GetPatch())
var (
err error
patchAction = action.(core.PatchActionImpl)
patchContent = patchAction.GetPatch()
)
savedNode, err = applyNodeStatusPatch(test.existingNode, patchContent)
if err != nil {
t.Logf("node patching failed, %v", err)
return false, nil
@ -2422,6 +2425,10 @@ func TestSyncLabels(t *testing.T) {
} else {
savedNode = test.existingNode
}
if savedNode == nil || savedNode.Labels == nil {
t.Logf("savedNode.Labels should not be nil")
return false, nil
}
val, ok := savedNode.Labels[v1.LabelOSStable]
if !ok {
t.Logf("expected kubernetes.io/os label to be present")