Merge pull request #64155 from figo/master

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. improve test: verify kubelet.config.Restore only happen once **What this PR does / why we need it**: This patch is to add additional test coverage of pod config restore, it verifies that restore can only happen once. in the second restore attempt, we should expect no error and no channel update. **Which issue(s) this PR fixes**: this is a test improvement based on test been added at https://github.com/kubernetes/kubernetes/pull/63553 **Special notes for your reviewer**: **Release note**: ```release-note None ``` /sig node /cc @rphillips @jiayingz @vikaschoudhary16 @anfernee @Random-Liu @dchen1107 @derekwaynecarr @vishh @yujuhong @tallclair

Merge pull request #64155 from figo/master
c6e0a225 · Kubernetes Submit Queue · GitHub · 10b9fd3a · bf48d39f · c6e0a225
Unverified Commit c6e0a225 authored May 29, 2018 by Kubernetes Submit Queue Committed by GitHub May 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

config_test.go pkg/kubelet/config/config_test.go +6 -0

No files found.
--- a/pkg/kubelet/config/config_test.go
+++ b/pkg/kubelet/config/config_test.go
@@ -451,4 +451,10 @@ func TestPodRestore(t *testing.T) {
 		t.Fatalf("Restore returned error: %v", err)
 	}
 	expectPodUpdate(t, ch, CreatePodUpdate(kubetypes.RESTORE, kubetypes.ApiserverSource, pod))
+	// Verify Restore only happen once
+	if err := config.Restore(tmpDir, channel); err != nil {
+		t.Fatalf("The second restore returned error: %v", err)
+	}
+	expectNoPodUpdate(t, ch)
 }