Expand test coverage in master, kubectl/cmd/util, pkg/registry/resourcequota, and api/rest.

pkg/registry/registrytest/endpoint.go

@@ -0,0 +1,92 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package registrytest
+
+import (
+	"fmt"
+	"sync"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+// Registry is an interface for things that know how to store endpoints.
+type EndpointRegistry struct {
+	Endpoints *api.EndpointsList
+	Updates   []api.Endpoints
+	Err       error
+
+	lock sync.Mutex
+}
+
+func (e *EndpointRegistry) ListEndpoints(ctx api.Context) (*api.EndpointsList, error) {
+	// TODO: support namespaces in this mock
+	e.lock.Lock()
+	defer e.lock.Unlock()
+
+	return e.Endpoints, e.Err
+}
+
+func (e *EndpointRegistry) GetEndpoints(ctx api.Context, name string) (*api.Endpoints, error) {
+	// TODO: support namespaces in this mock
+	e.lock.Lock()
+	defer e.lock.Unlock()
+	if e.Err != nil {
+		return nil, e.Err
+	}
+	if e.Endpoints != nil {
+		for _, endpoint := range e.Endpoints.Items {
+			if endpoint.Name == name {
+				return &endpoint, nil
+			}
+		}
+	}
+	return nil, errors.NewNotFound("Endpoints", name)
+}
+
+func (e *EndpointRegistry) WatchEndpoints(ctx api.Context, labels, fields labels.Selector, resourceVersion string) (watch.Interface, error) {
+	return nil, fmt.Errorf("unimplemented!")
+}
+
+func (e *EndpointRegistry) UpdateEndpoints(ctx api.Context, endpoints *api.Endpoints) error {
+	// TODO: support namespaces in this mock
+	e.lock.Lock()
+	defer e.lock.Unlock()
+
+	e.Updates = append(e.Updates, *endpoints)
+
+	if e.Err != nil {
+		return e.Err
+	}
+	if e.Endpoints == nil {
+		e.Endpoints = &api.EndpointsList{
+			Items: []api.Endpoints{
+				*endpoints,
+			},
+		}
+		return nil
+	}
+	for ix := range e.Endpoints.Items {
+		if e.Endpoints.Items[ix].Name == endpoints.Name {
+			e.Endpoints.Items[ix] = *endpoints
+		}
+	}
+	e.Endpoints.Items = append(e.Endpoints.Items, *endpoints)
+	return nil
+}

pkg/registry/registrytest/generic.go

@@ -59,7 +59,13 @@ func (r *GenericRegistry) WatchPredicate(ctx api.Context, m generic.Matcher, res
 func (r *GenericRegistry) Get(ctx api.Context, id string) (runtime.Object, error) {
 	r.Lock()
 	defer r.Unlock()
-	return r.Object, r.Err
+	if r.Err != nil {
+		return nil, r.Err
+	}
+	if r.Object != nil {
+		return r.Object, nil
+	}
+	panic("generic registry should either have an object or an error for Get")
 }
 
 func (r *GenericRegistry) CreateWithName(ctx api.Context, id string, obj runtime.Object) error {