Merge pull request #9918 from caesarxuchao/common_test

remove references to v1beta1 in common_test.go

Merge pull request #9918 from caesarxuchao/common_test
43889c61 · Saad Ali · 10631592 · b093af57 · 43889c61
Commit 43889c61 authored Jun 16, 2015 by Saad Ali
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

common_test.go pkg/kubelet/config/common_test.go +0 -5

No files found.
--- a/pkg/kubelet/config/common_test.go
+++ b/pkg/kubelet/config/common_test.go
@@ -120,11 +120,6 @@ func TestDecodePodList(t *testing.T) {
 		t.Errorf("unexpected error: %v", err)
 	}
 	parsed, podListOut, err := tryDecodePodList(json, noDefault)
-	if testapi.Version() == "v1beta1" {
-		// v1beta1 conversion leaves empty lists that should be nil
-		podListOut.Items[0].Spec.Containers[0].Resources.Limits = nil
-		podListOut.Items[0].Spec.Containers[0].Resources.Requests = nil
-	}
 	if !parsed {
 		t.Errorf("expected to have parsed file: (%s)", string(json))
 	}