CI test bug fixed

pull/2411/head
devinyan 9 years ago
parent bc0ea97082
commit b1d86479c6

@ -285,7 +285,7 @@ func TestReleaseStatus_VerifyOptions(t *testing.T) {
return errSkip return errSkip
}) })
if _, err := NewClient(b4c).ReleaseStatus(releaseName, StatusReleaseVersion(revision)); err != errSkip { if _, err := NewClient(b4c).ReleaseStatus(releaseName, StatusReleaseVersion(revision,"","")); err != errSkip {
t.Fatalf("did not expect error but got (%v)\n``", err) t.Fatalf("did not expect error but got (%v)\n``", err)
} }
} }

@ -323,8 +323,9 @@ func TestGet(t *testing.T) {
c := &Client{Factory: f} c := &Client{Factory: f}
// Test Success // Test Success
var filter FilterStruct
data := strings.NewReader("kind: Pod\napiVersion: v1\nmetadata:\n name: otter") data := strings.NewReader("kind: Pod\napiVersion: v1\nmetadata:\n name: otter")
o, err := c.Get("default", data) o, err := c.Get("default", data,filter)
if err != nil { if err != nil {
t.Errorf("Expected missing results, got %q", err) t.Errorf("Expected missing results, got %q", err)
} }
@ -334,7 +335,7 @@ func TestGet(t *testing.T) {
// Test failure // Test failure
data = strings.NewReader("kind: Pod\napiVersion: v1\nmetadata:\n name: starfish") data = strings.NewReader("kind: Pod\napiVersion: v1\nmetadata:\n name: starfish")
o, err = c.Get("default", data) o, err = c.Get("default", data,filter)
if err != nil { if err != nil {
t.Errorf("Expected missing results, got %q", err) t.Errorf("Expected missing results, got %q", err)
} }

@ -23,6 +23,7 @@ import (
"os" "os"
"testing" "testing"
"k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/release"
tillerEnv "k8s.io/helm/pkg/tiller/environment" tillerEnv "k8s.io/helm/pkg/tiller/environment"
) )
@ -68,8 +69,9 @@ func TestDeleteTestPods(t *testing.T) {
t.Errorf("Expected 0 errors, got at least one: %v", stream.messages) t.Errorf("Expected 0 errors, got at least one: %v", stream.messages)
} }
var filter kube.FilterStruct
for _, testManifest := range mockTestSuite.TestManifests { for _, testManifest := range mockTestSuite.TestManifests {
if _, err := mockTestEnv.KubeClient.Get(mockTestEnv.Namespace, bytes.NewBufferString(testManifest)); err == nil { if _, err := mockTestEnv.KubeClient.Get(mockTestEnv.Namespace, bytes.NewBufferString(testManifest),filter); err == nil {
t.Error("Expected error, got nil") t.Error("Expected error, got nil")
} }
} }
@ -122,7 +124,7 @@ func newGetFailingKubeClient() *getFailingKubeClient {
} }
} }
func (p *getFailingKubeClient) Get(ns string, r io.Reader) (string, error) { func (p *getFailingKubeClient) Get(ns string, r io.Reader,filter kube.FilterStruct) (string, error) {
return "", errors.New("In the end, they did not find Nemo.") return "", errors.New("In the end, they did not find Nemo.")
} }

Loading…
Cancel
Save