Merge pull request #12847 from jszczepkowski/prefix-cleanup

Cleanup of api path creation in client tests.
pull/6/head
Saad Ali 2015-08-19 14:50:42 -07:00
commit ecc6ce773b
6 changed files with 6 additions and 6 deletions

View File

@ -203,7 +203,7 @@ func TestLimitRangeWatch(t *testing.T) {
c := &testClient{
Request: testRequest{
Method: "GET",
Path: "/api/" + testapi.Version() + "/watch/" + getLimitRangesResourceName(),
Path: testapi.ResourcePathWithPrefix("watch", getLimitRangesResourceName(), "", ""),
Query: url.Values{"resourceVersion": []string{}}},
Response: Response{StatusCode: 200},
}

View File

@ -170,7 +170,7 @@ func TestNamespaceWatch(t *testing.T) {
c := &testClient{
Request: testRequest{
Method: "GET",
Path: "/api/" + testapi.Version() + "/watch/namespaces",
Path: testapi.ResourcePathWithPrefix("watch", "namespaces", "", ""),
Query: url.Values{"resourceVersion": []string{}}},
Response: Response{StatusCode: 200},
}

View File

@ -176,7 +176,7 @@ func TestPersistentVolumeWatch(t *testing.T) {
c := &testClient{
Request: testRequest{
Method: "GET",
Path: "/api/" + testapi.Version() + "/watch/" + getPersistentVolumesResoureName(),
Path: testapi.ResourcePathWithPrefix("watch", getPersistentVolumesResoureName(), "", ""),
Query: url.Values{"resourceVersion": []string{}}},
Response: Response{StatusCode: 200},
}

View File

@ -193,7 +193,7 @@ func TestPersistentVolumeClaimWatch(t *testing.T) {
c := &testClient{
Request: testRequest{
Method: "GET",
Path: "/api/" + testapi.Version() + "/watch/" + getPersistentVolumeClaimsResoureName(),
Path: testapi.ResourcePathWithPrefix("watch", getPersistentVolumeClaimsResoureName(), "", ""),
Query: url.Values{"resourceVersion": []string{}}},
Response: Response{StatusCode: 200},
}

View File

@ -133,7 +133,7 @@ func TestPodTemplateWatch(t *testing.T) {
c := &testClient{
Request: testRequest{
Method: "GET",
Path: "/api/" + testapi.Version() + "/watch/" + getPodTemplatesResoureName(),
Path: testapi.ResourcePathWithPrefix("watch", getPodTemplatesResoureName(), "", ""),
Query: url.Values{"resourceVersion": []string{}}},
Response: Response{StatusCode: 200},
}

View File

@ -189,7 +189,7 @@ func TestResourceQuotaWatch(t *testing.T) {
c := &testClient{
Request: testRequest{
Method: "GET",
Path: "/api/" + testapi.Version() + "/watch/" + getResourceQuotasResoureName(),
Path: testapi.ResourcePathWithPrefix("watch", getResourceQuotasResoureName(), "", ""),
Query: url.Values{"resourceVersion": []string{}}},
Response: Response{StatusCode: 200},
}