github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Migrate to IsControlledBy from meta/v1 package

Browse Source
This commit is contained in:
Mikhail Mazurskiy
2017-08-02 20:36:58 +10:00
parent 042b5642b9
commit 32b78aebf2
5 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/history/controller_history_test.go
View File

@@ -992,7 +992,7 @@ func TestRealHistory_AdoptControllerRevision(t *testing.T) {
if !test.err && err != nil {
t.Errorf("%s: %s", test.name, err)
}
if !test.err && metav1.GetControllerOf(adopted).UID != test.parent.GetUID() {
if !test.err && !metav1.IsControlledBy(adopted, test.parent) {
t.Errorf("%s: adoption failed", test.name)
}
if test.err && err == nil {
@@ -1103,7 +1103,7 @@ func TestFakeHistory_AdoptControllerRevision(t *testing.T) {
if !test.err && err != nil {
t.Errorf("%s: %s", test.name, err)
}
if !test.err && metav1.GetControllerOf(adopted).UID != test.parent.GetUID() {
if !test.err && !metav1.IsControlledBy(adopted, test.parent) {
t.Errorf("%s: adoption failed", test.name)
}
if test.err && err == nil {
@@ -1211,8 +1211,7 @@ func TestRealHistory_ReleaseControllerRevision(t *testing.T) {
if found == nil {
return true, nil, errors.NewNotFound(apps.Resource("controllerrevisions"), test.revision.Name)
}
if foundParent := metav1.GetControllerOf(test.revision); foundParent == nil ||
foundParent.UID != test.parent.GetUID() {
if !metav1.IsControlledBy(test.revision, test.parent) {
return true, nil, errors.NewInvalid(
test.revision.GroupVersionKind().GroupKind(), test.revision.Name, nil)
}
@@ -1258,7 +1257,7 @@ func TestRealHistory_ReleaseControllerRevision(t *testing.T) {
if adopted == nil {
return
}
if owner := metav1.GetControllerOf(adopted); owner != nil && owner.UID == test.parent.GetUID() {
if metav1.IsControlledBy(adopted, test.parent) {
t.Errorf("%s: release failed", test.name)
}
}
@@ -1386,7 +1385,7 @@ func TestFakeHistory_ReleaseControllerRevision(t *testing.T) {
if adopted == nil {
return
}
if owner := metav1.GetControllerOf(adopted); owner != nil && owner.UID == test.parent.GetUID() {
if metav1.IsControlledBy(adopted, test.parent) {
t.Errorf("%s: release failed", test.name)
}
}