tests updated

pull/99/head
Karolis Rusenas 2017-09-24 13:06:28 +01:00
parent dccfe21fa8
commit 775fcc10f9
5 changed files with 52 additions and 11 deletions

View File

@ -2,9 +2,13 @@ package poll
import (
"context"
"time"
"github.com/rusenask/keel/approvals"
"github.com/rusenask/keel/cache/memory"
"github.com/rusenask/keel/provider"
"github.com/rusenask/keel/types"
"github.com/rusenask/keel/util/codecs"
"github.com/rusenask/keel/util/image"
"testing"
@ -39,7 +43,9 @@ func TestCheckDeployment(t *testing.T) {
},
},
}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
// returning some sha
frc := &fakeRegistryClient{

View File

@ -2,10 +2,14 @@ package poll
import (
"testing"
"time"
"github.com/rusenask/keel/approvals"
"github.com/rusenask/keel/cache/memory"
"github.com/rusenask/keel/provider"
"github.com/rusenask/keel/registry"
"github.com/rusenask/keel/types"
"github.com/rusenask/keel/util/codecs"
"github.com/rusenask/keel/util/image"
)
@ -53,7 +57,9 @@ func (p *fakeProvider) TrackedImages() ([]*types.TrackedImage, error) {
func TestWatchTagJob(t *testing.T) {
fp := &fakeProvider{}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
frc := &fakeRegistryClient{
digestToReturn: "sha256:0604af35299dd37ff23937d115d103532948b568a9dd8197d14c256a8ab8b0bb",
@ -96,7 +102,9 @@ func TestWatchTagJob(t *testing.T) {
func TestWatchTagJobLatest(t *testing.T) {
fp := &fakeProvider{}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
frc := &fakeRegistryClient{
digestToReturn: "sha256:0604af35299dd37ff23937d115d103532948b568a9dd8197d14c256a8ab8b0bb",
@ -139,7 +147,9 @@ func TestWatchTagJobLatest(t *testing.T) {
func TestWatchAllTagsJob(t *testing.T) {
fp := &fakeProvider{}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
frc := &fakeRegistryClient{
tagsToReturn: []string{"1.1.2", "1.1.3", "0.9.1"},
@ -171,7 +181,9 @@ func TestWatchAllTagsJob(t *testing.T) {
func TestWatchAllTagsJobCurrentLatest(t *testing.T) {
fp := &fakeProvider{}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
frc := &fakeRegistryClient{
tagsToReturn: []string{"1.1.2", "1.1.3", "0.9.1"},

View File

@ -1,12 +1,16 @@
package pubsub
import (
"golang.org/x/net/context"
"sync"
"time"
"golang.org/x/net/context"
"github.com/rusenask/keel/approvals"
"github.com/rusenask/keel/cache/memory"
"github.com/rusenask/keel/provider"
"github.com/rusenask/keel/types"
"github.com/rusenask/keel/util/codecs"
"github.com/rusenask/keel/util/image"
"testing"
@ -62,7 +66,10 @@ func TestCheckDeployment(t *testing.T) {
},
},
}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
fs := &fakeSubscriber{}
mng := &DefaultManager{

View File

@ -2,11 +2,15 @@ package pubsub
import (
"encoding/json"
"time"
"cloud.google.com/go/pubsub"
"golang.org/x/net/context"
"github.com/rusenask/keel/approvals"
"github.com/rusenask/keel/cache/memory"
"github.com/rusenask/keel/provider"
"github.com/rusenask/keel/util/codecs"
"testing"
)
@ -21,7 +25,9 @@ func fakeDoneFunc(id string, done bool) {
func TestCallback(t *testing.T) {
fp := &fakeProvider{}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
sub := &PubsubSubscriber{disableAck: true, providers: providers}
dataMsg := &Message{Action: "INSERT", Tag: "gcr.io/v2-namespace/hello-world:1.1.1"}
@ -46,7 +52,9 @@ func TestCallback(t *testing.T) {
func TestCallbackTagNotSemver(t *testing.T) {
fp := &fakeProvider{}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
sub := &PubsubSubscriber{disableAck: true, providers: providers}
dataMsg := &Message{Action: "INSERT", Tag: "gcr.io/stemnapp/alpine-website:latest"}
@ -72,7 +80,9 @@ func TestCallbackTagNotSemver(t *testing.T) {
func TestCallbackNoTag(t *testing.T) {
fp := &fakeProvider{}
providers := provider.New([]provider.Provider{fp})
mem := memory.NewMemoryCache(100*time.Millisecond, 100*time.Millisecond, 10*time.Millisecond)
am := approvals.New(mem, codecs.DefaultSerializer())
providers := provider.New([]provider.Provider{fp}, am)
sub := &PubsubSubscriber{disableAck: true, providers: providers}
dataMsg := &Message{Action: "INSERT", Tag: "gcr.io/stemnapp/alpine-website"}
@ -92,5 +102,4 @@ func TestCallbackNoTag(t *testing.T) {
if fp.submitted[0].Repository.Tag != "latest" {
t.Errorf("expected repo tag %s but got %s", "latest", fp.submitted[0].Repository.Tag)
}
}

View File

@ -1,6 +1,7 @@
package testing
import (
core_v1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/pkg/apis/extensions/v1beta1"
)
@ -55,3 +56,9 @@ func (i *FakeK8sImplementer) Secret(namespace, name string) (*v1.Secret, error)
func (i *FakeK8sImplementer) Pods(namespace, labelSelector string) (*v1.PodList, error) {
return i.AvailablePods, nil
}
// ConfigMaps - returns nothing (not implemented)
func (i *FakeK8sImplementer) ConfigMaps(namespace string) core_v1.ConfigMapInterface {
panic("not implemented")
return nil
}