Skip to content

H
helm3
Commit 4db6cd93 authored by Adam Reese's avatar Adam Reese
Browse files
Options

fix(test): match output using regexp

parent 2fb8b607
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 12 deletions
cmd/helm/get_test.go
View file @ 4db6cd93
...@@ -18,6 +18,7 @@ package main ...@@ -18,6 +18,7 @@ package main
import ( import (
"bytes" "bytes"
"regexp"
"testing" "testing"
"k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/helm"
...@@ -40,7 +41,7 @@ func TestGetCmd(t *testing.T) { ...@@ -40,7 +41,7 @@ func TestGetCmd(t *testing.T) {
}, },
}, },
args: []string{"thomas-guide"}, args: []string{"thomas-guide"},
expected: "CHART: foo-0.1.0-beta.1\nRELEASED: Fri Sep 2 15:04:05 1977\nUSER-SUPPLIED VALUES:\nname: \"value\"\nCOMPUTED VALUES:\nname: value\n\nMANIFEST:", expected: "CHART: foo-0.1.0-beta.1\nRELEASED: (.*)\nUSER-SUPPLIED VALUES:\nname: \"value\"\nCOMPUTED VALUES:\nname: value\n\nMANIFEST:",
}, },
{ {
name: "requires release name arg", name: "requires release name arg",
...@@ -56,9 +57,9 @@ func TestGetCmd(t *testing.T) { ...@@ -56,9 +57,9 @@ func TestGetCmd(t *testing.T) {
if (err != nil) != tt.err { if (err != nil) != tt.err {
t.Errorf("%q. expected error: %v, got %v", tt.name, tt.err, err) t.Errorf("%q. expected error: %v, got %v", tt.name, tt.err, err)
} }
actual := string(bytes.TrimSpace(buf.Bytes())) re := regexp.MustCompile(tt.expected)
if actual != tt.expected { if !re.Match(buf.Bytes()) {
t.Errorf("%q. expected %q, got %q", tt.name, tt.expected, actual) t.Errorf("%q. expected %q, got %q", tt.name, tt.expected, buf.String())
} }
buf.Reset() buf.Reset()
} }
......
cmd/helm/list_test.go
View file @ 4db6cd93
...@@ -18,6 +18,7 @@ package main ...@@ -18,6 +18,7 @@ package main
import ( import (
"bytes" "bytes"
"regexp"
"testing" "testing"
"k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/helm"
...@@ -52,7 +53,7 @@ func TestListRun(t *testing.T) { ...@@ -52,7 +53,7 @@ func TestListRun(t *testing.T) {
}, },
long: true, long: true,
}, },
expected: "NAME \tUPDATED \tSTATUS \tCHART \natlas\tFri Sep 2 15:04:05 1977\tDEPLOYED\tfoo-0.1.0-beta.1", expected: "NAME \tUPDATED \tSTATUS \tCHART \natlas\t(.*)\tDEPLOYED\tfoo-0.1.0-beta.1",
}, },
} }
...@@ -63,9 +64,9 @@ func TestListRun(t *testing.T) { ...@@ -63,9 +64,9 @@ func TestListRun(t *testing.T) {
if (err != nil) != tt.err { if (err != nil) != tt.err {
t.Errorf("%q. expected error: %v, got %v", tt.name, tt.err, err) t.Errorf("%q. expected error: %v, got %v", tt.name, tt.err, err)
} }
actual := string(bytes.TrimSpace(buf.Bytes())) re := regexp.MustCompile(tt.expected)
if actual != tt.expected { if !re.Match(buf.Bytes()) {
t.Errorf("%q. expected %q, got %q", tt.name, tt.expected, actual) t.Errorf("%q. expected %q, got %q", tt.name, tt.expected, buf.String())
} }
buf.Reset() buf.Reset()
} }
...@@ -97,7 +98,7 @@ func TestListCmd(t *testing.T) { ...@@ -97,7 +98,7 @@ func TestListCmd(t *testing.T) {
releaseMock("atlas"), releaseMock("atlas"),
}, },
}, },
expected: "NAME \tUPDATED \tSTATUS \tCHART \natlas\tFri Sep 2 15:04:05 1977\tDEPLOYED\tfoo-0.1.0-beta.1", expected: "NAME \tUPDATED \tSTATUS \tCHART \natlas\t(.*)\tDEPLOYED\tfoo-0.1.0-beta.1",
}, },
} }
...@@ -111,9 +112,9 @@ func TestListCmd(t *testing.T) { ...@@ -111,9 +112,9 @@ func TestListCmd(t *testing.T) {
if (err != nil) != tt.err { if (err != nil) != tt.err {
t.Errorf("%q. expected error: %v, got %v", tt.name, tt.err, err) t.Errorf("%q. expected error: %v, got %v", tt.name, tt.err, err)
} }
actual := string(bytes.TrimSpace(buf.Bytes())) re := regexp.MustCompile(tt.expected)
if actual != tt.expected { if !re.Match(buf.Bytes()) {
t.Errorf("%q. expected %q, got %q", tt.name, tt.expected, actual) t.Errorf("%q. expected %q, got %q", tt.name, tt.expected, buf.String())
} }
buf.Reset() buf.Reset()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment