github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80859 from wojtek-t/fix_selflinks_in_tests

Browse Source 
Fix selflinks in tests
This commit is contained in:
Kubernetes Prow Robot 2019-08-01 15:01:30 -07:00 committed by GitHub
commit 3287bf7a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/cronjob/injection.go
View File

@ -141,7 +141,7 @@ func (f *fakeJobControl) CreateJob(namespace string, job *batchv1.Job) (*batchv1
if f.Err != nil { if f.Err != nil {
return nil, f.Err return nil, f.Err
} }
job.SelfLink = fmt.Sprintf("/api/batch/v1/namespaces/%s/jobs/%s", namespace, job.Name) job.SelfLink = fmt.Sprintf("/apis/batch/v1/namespaces/%s/jobs/%s", namespace, job.Name)
f.Jobs = append(f.Jobs, *job) f.Jobs = append(f.Jobs, *job)
job.UID = "test-uid" job.UID = "test-uid"
return job, nil return job, nil

6
staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go
View File

@ -2439,7 +2439,7 @@ func TestDescribeEvents(t *testing.T) {
fake.NewSimpleClientset(&corev1.Node{ fake.NewSimpleClientset(&corev1.Node{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "bar", Name: "bar",
SelfLink: "url/url/url/url", SelfLink: "/api/v1/nodes/bar",
}, },
}, events), }, events),
}, },
@ -2447,7 +2447,7 @@ func TestDescribeEvents(t *testing.T) {
fake.NewSimpleClientset(&corev1.PersistentVolume{ fake.NewSimpleClientset(&corev1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "bar", Name: "bar",
SelfLink: "url/url/url/url", SelfLink: "/api/v1/persistentvolumes/bar",
}, },
}, events), }, events),
}, },
@ -2456,7 +2456,7 @@ func TestDescribeEvents(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "bar", Name: "bar",
Namespace: "foo", Namespace: "foo",
SelfLink: "url/url/url/url", SelfLink: "/api/v1/namespaces/foo/pods/bar",
}, },
}, events), }, events),
}, },

2
test/integration/events/events_test.go
View File

@ -42,7 +42,7 @@ func TestEventCompatibility(t *testing.T) {
testPod := &v1.Pod{ testPod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
SelfLink: "/api/version/pods/foo", SelfLink: "/api/v1/namespaces/default/pods/foo",
Name: "foo", Name: "foo",
Namespace: "default", Namespace: "default",
UID: "bar", UID: "bar",