From 44d9274df379c469862397e3949e6ddae0dd460e Mon Sep 17 00:00:00 2001 From: Nikolay Mahotkin Date: Thu, 15 Dec 2016 11:04:55 +0300 Subject: [PATCH] Fixing tests --- pkg/kube/client_test.go | 2 +- pkg/tiller/environment/environment.go | 2 +- pkg/tiller/environment/environment_test.go | 2 +- pkg/tiller/release_server_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index cd7c9850b..1f480e81d 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -119,7 +119,7 @@ func TestUpdate(t *testing.T) { } c := &Client{Factory: f} - if err := c.Update("test", objBody(codec, &listA), objBody(codec, &listB)); err != nil { + if err := c.Update("test", objBody(codec, &listA), objBody(codec, &listB), false); err != nil { t.Fatal(err) } diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go index bde2740ad..6cd20d786 100644 --- a/pkg/tiller/environment/environment.go +++ b/pkg/tiller/environment/environment.go @@ -167,7 +167,7 @@ func (p *PrintingKubeClient) WatchUntilReady(ns string, r io.Reader) error { } // Update implements KubeClient Update. -func (p *PrintingKubeClient) Update(ns string, currentReader, modifiedReader io.Reader) error { +func (p *PrintingKubeClient) Update(ns string, currentReader, modifiedReader io.Reader, restart bool) error { _, err := io.Copy(p.Out, modifiedReader) return err } diff --git a/pkg/tiller/environment/environment_test.go b/pkg/tiller/environment/environment_test.go index f547c75a9..3e5a7e5ee 100644 --- a/pkg/tiller/environment/environment_test.go +++ b/pkg/tiller/environment/environment_test.go @@ -44,7 +44,7 @@ func (k *mockKubeClient) Get(ns string, r io.Reader) (string, error) { func (k *mockKubeClient) Delete(ns string, r io.Reader) error { return nil } -func (k *mockKubeClient) Update(ns string, currentReader, modifiedReader io.Reader) error { +func (k *mockKubeClient) Update(ns string, currentReader, modifiedReader io.Reader, restart bool) error { return nil } func (k *mockKubeClient) WatchUntilReady(ns string, r io.Reader) error { diff --git a/pkg/tiller/release_server_test.go b/pkg/tiller/release_server_test.go index 95caac4e4..5db9b6e3e 100644 --- a/pkg/tiller/release_server_test.go +++ b/pkg/tiller/release_server_test.go @@ -1361,7 +1361,7 @@ type updateFailingKubeClient struct { environment.PrintingKubeClient } -func (u *updateFailingKubeClient) Update(namespace string, originalReader, modifiedReader io.Reader) error { +func (u *updateFailingKubeClient) Update(namespace string, originalReader, modifiedReader io.Reader, restart bool) error { return errors.New("Failed update in kube client") }