Merge pull request #47105 from feiskyer/cleanup

Automatic merge from submit-queue (batch tested with PRs 47038, 47105) kuberuntime: cleanup TestGenerateContainerConfig Followup of #47009, cleanup TestGenerateContainerConfig and remove unused expectedConfig. /assign @yujuhong

Merge pull request #47105 from feiskyer/cleanup
0d84a4fe · Kubernetes Submit Queue · GitHub · 6acfb0f8 · 82ff0ad0 · 0d84a4fe
Commit 0d84a4fe authored Jun 27, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

kuberuntime_container_test.go pkg/kubelet/kuberuntime/kuberuntime_container_test.go +1 -2

No files found.
--- a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go
@@ -251,7 +251,6 @@ func TestGenerateContainerConfig(t *testing.T) {
 		},
 	}
-	expectedConfig = makeExpetectedConfig(m, podWithContainerSecurityContext, 0)
+	_, err = m.generateContainerConfig(&podWithContainerSecurityContext.Spec.Containers[0], podWithContainerSecurityContext, 0, "", podWithContainerSecurityContext.Spec.Containers[0].Image)
-	containerConfig, err = m.generateContainerConfig(&podWithContainerSecurityContext.Spec.Containers[0], podWithContainerSecurityContext, 0, "", podWithContainerSecurityContext.Spec.Containers[0].Image)
 	assert.Error(t, err)
 }