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

adding a unit test

Browse Source
This commit is contained in:
Chao Xu 2016-02-24 22:07:54 -08:00
parent 5b108acb38
commit 4adb110516
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkg/master/master_test.go
View File

@ -568,8 +568,7 @@ func testInstallThirdPartyAPIListVersion(t *testing.T, version string) {
} }
if len(list.Items) != len(test.items) { if len(list.Items) != len(test.items) {
t.Errorf("unexpected length: %d vs %d", len(list.Items), len(test.items)) t.Fatalf("unexpected length: %d vs %d", len(list.Items), len(test.items))
return
} }
// The order of elements in LIST is not guaranteed. // The order of elements in LIST is not guaranteed.
mapping := make(map[string]int) mapping := make(map[string]int)
@ -715,8 +714,7 @@ func testInstallThirdPartyAPIPostForVersion(t *testing.T, version string) {
resp, err := http.Post(server.URL+"/apis/company.com/"+version+"/namespaces/default/foos", "application/json", bytes.NewBuffer(data)) resp, err := http.Post(server.URL+"/apis/company.com/"+version+"/namespaces/default/foos", "application/json", bytes.NewBuffer(data))
if !assert.NoError(err) { if !assert.NoError(err) {
t.Errorf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
return
} }
assert.Equal(http.StatusCreated, resp.StatusCode) assert.Equal(http.StatusCreated, resp.StatusCode)
@ -829,6 +827,39 @@ func httpDelete(url string) (*http.Response, error) {
return client.Do(req) return client.Do(req)
} }
func TestInstallThirdPartyAPIListOptions(t *testing.T) {
for _, version := range versionsToTest {
testInstallThirdPartyAPIListOptionsForVersion(t, version)
}
}
func testInstallThirdPartyAPIListOptionsForVersion(t *testing.T, version string) {
_, etcdserver, server, assert := initThirdParty(t, version)
// TODO: Uncomment when fix #19254
// defer server.Close()
defer etcdserver.Terminate(t)
// send a GET request with query parameter
resp, err := httpGetWithRV(server.URL + "/apis/company.com/" + version + "/namespaces/default/foos")
if !assert.NoError(err) {
t.Fatalf("unexpected error: %v", err)
}
assert.Equal(http.StatusOK, resp.StatusCode)
}
func httpGetWithRV(url string) (*http.Response, error) {
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return nil, err
}
q := req.URL.Query()
// resourceversion is part of a ListOptions
q.Add("resourceversion", "0")
req.URL.RawQuery = q.Encode()
client := &http.Client{}
return client.Do(req)
}
func TestInstallThirdPartyResourceRemove(t *testing.T) { func TestInstallThirdPartyResourceRemove(t *testing.T) {
for _, version := range versionsToTest { for _, version := range versionsToTest {
testInstallThirdPartyResourceRemove(t, version) testInstallThirdPartyResourceRemove(t, version)