scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move pkg/client/unvrsioned#testClient to pkg/client/unversioned/testclient#simple

Browse Source
This commit is contained in:
Chao Xu
2015-12-03 17:22:48 -08:00
parent 8d46df0162
commit 6f0eb521a6
20 changed files with 723 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
pkg/client/unversioned/ingress_test.go
View File

@@ -14,7 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package unversioned
package unversioned_test
import (
. "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/testclient/simple"
)
import (
"testing"
@@ -31,12 +36,12 @@ func getIngressResourceName() string {
func TestListIngress(t *testing.T) {
ns := api.NamespaceAll
c := &testClient{
Request: testRequest{
c := &simple.Client{
Request: simple.Request{
Method: "GET",
Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, ""),
},
Response: Response{StatusCode: 200,
Response: simple.Response{StatusCode: 200,
Body: &extensions.IngressList{
Items: []extensions.Ingress{
{
@@ -61,13 +66,13 @@ func TestListIngress(t *testing.T) {
func TestGetIngress(t *testing.T) {
ns := api.NamespaceDefault
c := &testClient{
Request: testRequest{
c := &simple.Client{
Request: simple.Request{
Method: "GET",
Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"),
Query: buildQueryValues(nil),
Query: simple.BuildQueryValues(nil),
},
Response: Response{
Response: simple.Response{
StatusCode: 200,
Body: &extensions.Ingress{
ObjectMeta: api.ObjectMeta{
@@ -89,10 +94,10 @@ func TestGetIngress(t *testing.T) {
func TestGetIngressWithNoName(t *testing.T) {
ns := api.NamespaceDefault
c := &testClient{Error: true}
c := &simple.Client{Error: true}
receivedIngress, err := c.Setup(t).Extensions().Ingress(ns).Get("")
if (err != nil) && (err.Error() != nameRequiredError) {
t.Errorf("Expected error: %v, but got %v", nameRequiredError, err)
if (err != nil) && (err.Error() != simple.NameRequiredError) {
t.Errorf("Expected error: %v, but got %v", simple.NameRequiredError, err)
}
c.Validate(t, receivedIngress, err)
@@ -107,13 +112,13 @@ func TestUpdateIngress(t *testing.T) {
ResourceVersion: "1",
},
}
c := &testClient{
Request: testRequest{
c := &simple.Client{
Request: simple.Request{
Method: "PUT",
Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"),
Query: buildQueryValues(nil),
Query: simple.BuildQueryValues(nil),
},
Response: Response{
Response: simple.Response{
StatusCode: 200,
Body: &extensions.Ingress{
ObjectMeta: api.ObjectMeta{
@@ -150,13 +155,13 @@ func TestUpdateIngressStatus(t *testing.T) {
LoadBalancer: lbStatus,
},
}
c := &testClient{
Request: testRequest{
c := &simple.Client{
Request: simple.Request{
Method: "PUT",
Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo") + "/status",
Query: buildQueryValues(nil),
Query: simple.BuildQueryValues(nil),
},
Response: Response{
Response: simple.Response{
StatusCode: 200,
Body: &extensions.Ingress{
ObjectMeta: api.ObjectMeta{
@@ -181,13 +186,13 @@ func TestUpdateIngressStatus(t *testing.T) {
func TestDeleteIngress(t *testing.T) {
ns := api.NamespaceDefault
c := &testClient{
Request: testRequest{
c := &simple.Client{
Request: simple.Request{
Method: "DELETE",
Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"),
Query: buildQueryValues(nil),
Query: simple.BuildQueryValues(nil),
},
Response: Response{StatusCode: 200},
Response: simple.Response{StatusCode: 200},
}
err := c.Setup(t).Extensions().Ingress(ns).Delete("foo", nil)
c.Validate(t, nil, err)
@@ -201,14 +206,14 @@ func TestCreateIngress(t *testing.T) {
Namespace: ns,
},
}
c := &testClient{
Request: testRequest{
c := &simple.Client{
Request: simple.Request{
Method: "POST",
Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, ""),
Body: requestIngress,
Query: buildQueryValues(nil),
Query: simple.BuildQueryValues(nil),
},
Response: Response{
Response: simple.Response{
StatusCode: 200,
Body: &extensions.Ingress{
ObjectMeta: api.ObjectMeta{