Fix unit tests.

pull/2160/head
tamal 9 years ago
parent 4cdf63f10c
commit 6f65233cdb

@ -1,12 +1,13 @@
package fake package fake
import ( import (
"k8s.io/helm/client/clientset"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apimachinery/registered"
testing "k8s.io/kubernetes/pkg/client/testing/core" testing "k8s.io/kubernetes/pkg/client/testing/core"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/pkg/watch"
"k8s.io/helm/client/clientset"
) )
type FakeExtensionClient struct { type FakeExtensionClient struct {

@ -50,9 +50,12 @@ func (mock *FakeRelease) List(opts api.ListOptions) (*aci.ReleaseList, error) {
} }
// Create creates a new Release. // Create creates a new Release.
func (mock *FakeRelease) Create(svc *aci.Release) (*aci.Release, error) { func (mock *FakeRelease) Create(r *aci.Release) (*aci.Release, error) {
if r != nil {
r.Namespace = mock.ns
}
obj, err := mock.Fake. obj, err := mock.Fake.
Invokes(testing.NewCreateAction(certResource, mock.ns, svc), &aci.Release{}) Invokes(testing.NewCreateAction(certResource, mock.ns, r), &aci.Release{})
if obj == nil { if obj == nil {
return nil, err return nil, err
@ -61,9 +64,12 @@ func (mock *FakeRelease) Create(svc *aci.Release) (*aci.Release, error) {
} }
// Update updates a Release. // Update updates a Release.
func (mock *FakeRelease) Update(svc *aci.Release) (*aci.Release, error) { func (mock *FakeRelease) Update(r *aci.Release) (*aci.Release, error) {
if r != nil {
r.Namespace = mock.ns
}
obj, err := mock.Fake. obj, err := mock.Fake.
Invokes(testing.NewUpdateAction(certResource, mock.ns, svc), &aci.Release{}) Invokes(testing.NewUpdateAction(certResource, mock.ns, r), &aci.Release{})
if obj == nil { if obj == nil {
return nil, err return nil, err
@ -79,9 +85,12 @@ func (mock *FakeRelease) Delete(name string) error {
return err return err
} }
func (mock *FakeRelease) UpdateStatus(srv *aci.Release) (*aci.Release, error) { func (mock *FakeRelease) UpdateStatus(r *aci.Release) (*aci.Release, error) {
if r != nil {
r.Namespace = mock.ns
}
obj, err := mock.Fake. obj, err := mock.Fake.
Invokes(testing.NewUpdateSubresourceAction(certResource, "status", mock.ns, srv), &aci.Release{}) Invokes(testing.NewUpdateSubresourceAction(certResource, "status", mock.ns, r), &aci.Release{})
if obj == nil { if obj == nil {
return nil, err return nil, err

@ -372,6 +372,10 @@ func newReleasesObject(key string, rls *rspb.Release, lbs labels) (*rapi.Release
// create and return release object // create and return release object
r := &rapi.Release{ r := &rapi.Release{
TypeMeta: unversioned.TypeMeta{
Kind: "Release",
APIVersion: "helm.sh/v1alpha1",
},
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: key, Name: key,
Labels: lbs.toMap(), Labels: lbs.toMap(),

@ -19,11 +19,11 @@ import (
"testing" "testing"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"k8s.io/kubernetes/pkg/runtime"
_ "k8s.io/helm/api/install" _ "k8s.io/helm/api/install"
"k8s.io/helm/client/clientset/fake" "k8s.io/helm/client/clientset/fake"
rspb "k8s.io/helm/pkg/proto/hapi/release" rspb "k8s.io/helm/pkg/proto/hapi/release"
"k8s.io/kubernetes/pkg/runtime"
) )
// newTestFixture initializes a FakeReleaseInterface. // newTestFixture initializes a FakeReleaseInterface.
@ -42,6 +42,7 @@ func initFakeTPRs(t *testing.T, releases ...*rspb.Release) []runtime.Object {
if err != nil { if err != nil {
t.Fatalf("Failed to create configmap: %s", err) t.Fatalf("Failed to create configmap: %s", err)
} }
r.Namespace = "default"
var obj runtime.Object = r var obj runtime.Object = r
objects = append(objects, obj) objects = append(objects, obj)
} }
@ -83,7 +84,7 @@ func TestUNcompressedReleaseGet(t *testing.T) {
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED)
// Create a test fixture which contains an uncompressed release // Create a test fixture which contains an uncompressed release
cfgmap, err := newReleasesObject(key, rel, nil) r, err := newReleasesObject(key, rel, nil)
if err != nil { if err != nil {
t.Fatalf("Failed to create configmap: %s", err) t.Fatalf("Failed to create configmap: %s", err)
} }
@ -91,8 +92,8 @@ func TestUNcompressedReleaseGet(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Failed to marshal release: %s", err) t.Fatalf("Failed to marshal release: %s", err)
} }
cfgmap.Spec.Data.Inline = base64.StdEncoding.EncodeToString(b) r.Spec.Data = base64.StdEncoding.EncodeToString(b)
releases := NewReleases(fake.NewFakeExtensionClient(initFakeTPRs(t, rel)...).Releases("test")) releases := NewReleases(fake.NewFakeExtensionClient(initFakeTPRs(t, rel)...).Releases("default"))
// get release with key // get release with key
got, err := releases.Get(key) got, err := releases.Get(key)

Loading…
Cancel
Save