From 404a1b1dc51a8e77183af79f27f7875f64106b7e Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Fri, 20 May 2016 15:01:53 -0400
Subject: [PATCH] Remove alpha init containers from benchmarks (skews results)

---
 pkg/api/conversion_test.go    | 15 +++++++++------
 pkg/api/serialization_test.go |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkg/api/conversion_test.go b/pkg/api/conversion_test.go
index f691d2669f5..1f4c3a174ea 100644
--- a/pkg/api/conversion_test.go
+++ b/pkg/api/conversion_test.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/testapi"
 	apitesting "k8s.io/kubernetes/pkg/api/testing"
 	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/diff"
 )
 
 func BenchmarkPodConversion(b *testing.B) {
@@ -32,6 +33,8 @@ func BenchmarkPodConversion(b *testing.B) {
 	items := make([]api.Pod, 4)
 	for i := range items {
 		apiObjectFuzzer.Fuzz(&items[i])
+		items[i].Spec.InitContainers = nil
+		items[i].Status.InitContainerStatuses = nil
 	}
 
 	// add a fixed item
@@ -47,20 +50,16 @@ func BenchmarkPodConversion(b *testing.B) {
 	width := len(items)
 
 	scheme := api.Scheme
-	var result *api.Pod
 	for i := 0; i < b.N; i++ {
 		pod := &items[i%width]
 		versionedObj, err := scheme.UnsafeConvertToVersion(pod, *testapi.Default.GroupVersion())
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
-		obj, err := scheme.UnsafeConvertToVersion(versionedObj, testapi.Default.InternalGroupVersion())
-		if err != nil {
+		if _, err = scheme.UnsafeConvertToVersion(versionedObj, testapi.Default.InternalGroupVersion()); err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
-		result = obj.(*api.Pod)
 	}
-	b.Log(result)
 }
 
 func BenchmarkNodeConversion(b *testing.B) {
@@ -75,6 +74,7 @@ func BenchmarkNodeConversion(b *testing.B) {
 
 	scheme := api.Scheme
 	var result *api.Node
+	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		versionedObj, err := scheme.UnsafeConvertToVersion(&node, *testapi.Default.GroupVersion())
 		if err != nil {
@@ -86,8 +86,9 @@ func BenchmarkNodeConversion(b *testing.B) {
 		}
 		result = obj.(*api.Node)
 	}
+	b.StopTimer()
 	if !api.Semantic.DeepDerivative(node, *result) {
-		b.Fatalf("Incorrect conversion: expected %v, got %v", node, *result)
+		b.Fatalf("Incorrect conversion: %s", diff.ObjectDiff(node, *result))
 	}
 }
 
@@ -103,6 +104,7 @@ func BenchmarkReplicationControllerConversion(b *testing.B) {
 
 	scheme := api.Scheme
 	var result *api.ReplicationController
+	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		versionedObj, err := scheme.UnsafeConvertToVersion(&replicationController, *testapi.Default.GroupVersion())
 		if err != nil {
@@ -114,6 +116,7 @@ func BenchmarkReplicationControllerConversion(b *testing.B) {
 		}
 		result = obj.(*api.ReplicationController)
 	}
+	b.StopTimer()
 	if !api.Semantic.DeepDerivative(replicationController, *result) {
 		b.Fatalf("Incorrect conversion: expected %v, got %v", replicationController, *result)
 	}
diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go
index 555d3ab44fb..4f9fa87964f 100644
--- a/pkg/api/serialization_test.go
+++ b/pkg/api/serialization_test.go
@@ -358,6 +358,7 @@ func benchmarkItems() []v1.Pod {
 	for i := range items {
 		var pod api.Pod
 		apiObjectFuzzer.Fuzz(&pod)
+		pod.Spec.InitContainers, pod.Status.InitContainerStatuses = nil, nil
 		out, err := api.Scheme.ConvertToVersion(&pod, v1.SchemeGroupVersion)
 		if err != nil {
 			panic(err)