github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41961 from janetkuo/sort-slice-compare

Browse Source 
Sort slices before comparing in deployment util test
This commit is contained in:
Saad Ali 2017-02-23 17:07:08 -08:00 committed by GitHub
commit b3453d0bd2
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/deployment/util/BUILD
View File

@ -57,6 +57,7 @@ go_test(
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library",
"//pkg/controller:go_default_library",
"//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/assert",
"//vendor:k8s.io/apimachinery/pkg/api/equality", "//vendor:k8s.io/apimachinery/pkg/api/equality",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",

9
pkg/controller/deployment/util/deployment_util_test.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"math/rand" "math/rand"
"reflect" "reflect"
"sort"
"strconv" "strconv"
"testing" "testing"
"time" "time"
@ -36,6 +37,7 @@ import (
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
"k8s.io/kubernetes/pkg/controller"
) )
func addListRSReactor(fakeClient *fake.Clientset, obj runtime.Object) *fake.Clientset { func addListRSReactor(fakeClient *fake.Clientset, obj runtime.Object) *fake.Clientset {
@ -527,6 +529,7 @@ func TestFindNewReplicaSet(t *testing.T) {
func TestFindOldReplicaSets(t *testing.T) { func TestFindOldReplicaSets(t *testing.T) {
now := metav1.Now() now := metav1.Now()
later := metav1.Time{Time: now.Add(time.Minute)} later := metav1.Time{Time: now.Add(time.Minute)}
before := metav1.Time{Time: now.Add(-time.Minute)}
deployment := generateDeployment("nginx") deployment := generateDeployment("nginx")
newRS := generateRS(deployment) newRS := generateRS(deployment)
@ -541,6 +544,7 @@ func TestFindOldReplicaSets(t *testing.T) {
oldDeployment.Spec.Template.Spec.Containers[0].Name = "nginx-old-1" oldDeployment.Spec.Template.Spec.Containers[0].Name = "nginx-old-1"
oldRS := generateRS(oldDeployment) oldRS := generateRS(oldDeployment)
oldRS.Status.FullyLabeledReplicas = *(oldRS.Spec.Replicas) oldRS.Status.FullyLabeledReplicas = *(oldRS.Spec.Replicas)
oldRS.CreationTimestamp = before
newPod := generatePodFromRS(newRS) newPod := generatePodFromRS(newRS)
oldPod := generatePodFromRS(oldRS) oldPod := generatePodFromRS(oldRS)
@ -601,7 +605,10 @@ func TestFindOldReplicaSets(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
if old, _, err := FindOldReplicaSets(&test.deployment, test.rsList, test.podList); !reflect.DeepEqual(old, test.expected) || err != nil { old, _, err := FindOldReplicaSets(&test.deployment, test.rsList, test.podList)
sort.Sort(controller.ReplicaSetsByCreationTimestamp(old))
sort.Sort(controller.ReplicaSetsByCreationTimestamp(test.expected))
if !reflect.DeepEqual(old, test.expected) || err != nil {
t.Errorf("In test case %q, expected %#v, got %#v: %v", test.test, test.expected, old, err) t.Errorf("In test case %q, expected %#v, got %#v: %v", test.test, test.expected, old, err)
} }
} }