github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address comments; fix test failure

Browse Source
This commit is contained in:
Janet Kuo
2016-02-22 10:33:59 -08:00
parent dc78af948e
commit 4699a6d8a2
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/deployment/deployment.go
View File

@@ -191,7 +191,7 @@ func addHashKeyToRSAndPods(deployment extensions.Deployment, c clientset.Interfa
} }
} }
// Make sure rs pod template is updated so that it won't create pods without the new label (orphaned pods). // Make sure rs pod template is updated so that it won't create pods without the new label (orphaned pods).
if updatedRS.Generation != updatedRS.Status.ObservedGeneration { if updatedRS.Generation > updatedRS.Status.ObservedGeneration {
if err = waitForReplicaSetUpdated(c, updatedRS.Generation, namespace, rs.Name); err != nil { if err = waitForReplicaSetUpdated(c, updatedRS.Generation, namespace, rs.Name); err != nil {
return nil, err return nil, err
} }

51
pkg/util/deployment/deployment_test.go
View File

@@ -22,14 +22,11 @@ import (
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
"k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/testing/core"
"k8s.io/kubernetes/pkg/client/testing/fake"
"k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/client/unversioned/testclient"
"k8s.io/kubernetes/pkg/client/unversioned/testclient/simple"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
) )
@@ -223,47 +220,47 @@ func TestGetNewRC(t *testing.T) {
tests := []struct { tests := []struct {
test string test string
rsList extensions.ReplicaSetList objs []runtime.Object
expected *extensions.ReplicaSet expected *extensions.ReplicaSet
}{ }{
{ {
"No new ReplicaSet", "No new ReplicaSet",
extensions.ReplicaSetList{ []runtime.Object{
Items: []extensions.ReplicaSet{ &api.PodList{},
generateRS(generateDeployment("foo")), &extensions.ReplicaSetList{
generateRS(generateDeployment("bar")), Items: []extensions.ReplicaSet{
generateRS(generateDeployment("foo")),
generateRS(generateDeployment("bar")),
},
}, },
}, },
nil, nil,
}, },
{ {
"Has new ReplicaSet", "Has new ReplicaSet",
extensions.ReplicaSetList{ []runtime.Object{
Items: []extensions.ReplicaSet{ &api.PodList{},
generateRS(generateDeployment("foo")), &extensions.ReplicaSetList{
generateRS(generateDeployment("bar")), Items: []extensions.ReplicaSet{
generateRS(generateDeployment("abc")), generateRS(generateDeployment("foo")),
newRC, generateRS(generateDeployment("bar")),
generateRS(generateDeployment("xyz")), generateRS(generateDeployment("abc")),
newRC,
generateRS(generateDeployment("xyz")),
},
}, },
}, },
&newRC, &newRC,
}, },
} }
ns := api.NamespaceDefault
for _, test := range tests { for _, test := range tests {
c := &simple.Client{ fakeClient := &fake.Clientset{}
Request: simple.Request{ fakeClient = addListPodsReactor(fakeClient, test.objs[0])
Method: "GET", fakeClient = addListRSReactor(fakeClient, test.objs[1])
Path: testapi.Default.ResourcePath("replicaSets", ns, ""), fakeClient = addUpdatePodsReactor(fakeClient)
}, fakeClient = addUpdateRSReactor(fakeClient)
Response: simple.Response{ rs, err := GetNewReplicaSet(newDeployment, fakeClient)
StatusCode: 200,
Body: &test.rsList,
},
}
rs, err := GetNewReplicaSet(newDeployment, c.Setup(t).Clientset)
if err != nil { if err != nil {
t.Errorf("In test case %s, got unexpected error %v", test.test, err) t.Errorf("In test case %s, got unexpected error %v", test.test, err)
} }

1
test/e2e/deployment.go
View File

@@ -849,6 +849,7 @@ func testDeploymentLabelAdopted(f *Framework) {
Expect(c.Extensions().ReplicaSets(ns).Delete(newRS.Name, nil)).NotTo(HaveOccurred()) Expect(c.Extensions().ReplicaSets(ns).Delete(newRS.Name, nil)).NotTo(HaveOccurred())
}() }()
// The RS and pods should be relabeled before the status is updated by syncRollingUpdateDeployment
err = waitForDeploymentStatus(c, ns, deploymentName, replicas, replicas-1, replicas+1, 0) err = waitForDeploymentStatus(c, ns, deploymentName, replicas, replicas-1, replicas+1, 0)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())