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

Address comments.

Browse Source
This commit is contained in:
Brendan Burns
2015-09-14 13:37:40 -07:00
parent 0a3aa2242b
commit 8d0016b542
4 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/master/thirdparty_controller_test.go
View File

@@ -20,7 +20,7 @@ import (
"testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/expapi"
expapi "k8s.io/kubernetes/pkg/apis/experimental"
"k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata"
"k8s.io/kubernetes/pkg/util/sets"
)
@@ -94,11 +94,33 @@ func TestSyncAPIs(t *testing.T) {
},
},
apis: []string{
"/thirdparty/example.com",
"/thirdparty/example.com/v1",
"/apis/example.com",
"/apis/example.com/v1",
},
name: "does nothing",
},
{
list: &expapi.ThirdPartyResourceList{
Items: []expapi.ThirdPartyResource{
{
ObjectMeta: api.ObjectMeta{
Name: "foo.example.com",
},
},
},
},
apis: []string{
"/apis/example.com",
"/apis/example.com/v1",
"/apis/example.co",
"/apis/example.co/v1",
},
name: "deletes substring API",
expectedRemoved: []string{
"/apis/example.co",
"/apis/example.co/v1",
},
},
{
list: &expapi.ThirdPartyResourceList{
Items: []expapi.ThirdPartyResource{
@@ -115,8 +137,8 @@ func TestSyncAPIs(t *testing.T) {
},
},
apis: []string{
"/thirdparty/company.com",
"/thirdparty/company.com/v1",
"/apis/company.com",
"/apis/company.com/v1",
},
expectedInstalled: []string{"foo.example.com"},
name: "adds with existing",
@@ -132,11 +154,11 @@ func TestSyncAPIs(t *testing.T) {
},
},
apis: []string{
"/thirdparty/company.com",
"/thirdparty/company.com/v1",
"/apis/company.com",
"/apis/company.com/v1",
},
expectedInstalled: []string{"foo.example.com"},
expectedRemoved: []string{"/thirdparty/company.com", "/thirdparty/company.com/v1"},
expectedRemoved: []string{"/apis/company.com", "/apis/company.com/v1"},
name: "removes with existing",
},
}