From 54888f1421cae2731fc32346c47a83a8d227f48a Mon Sep 17 00:00:00 2001
From: Wil Reichert <wil.reichert@gmail.com>
Date: Mon, 19 Jun 2017 20:50:45 +0900
Subject: [PATCH] linter fixes

---
 pkg/lint/lint_test.go           |  6 +++---
 pkg/lint/rules/template.go      |  4 ++--
 pkg/lint/rules/template_test.go | 10 +++++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 1162ee972..fbb0b5a5d 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -86,8 +86,8 @@ func TestBadValues(t *testing.T) {
 }
 
 func TestGoodChart(t *testing.T) {
-	m := All(goodChartDir).Messages
-	if len(m) != 0 {
-		t.Errorf("All failed but shouldn't have: %#v", m)
+	sev := All(goodChartDir).HighestSeverity
+	if sev > support.WarningSev {
+		t.Errorf("All failed but shouldn't have: %#v", sev)
 	}
 }
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 241852b01..ab4efe099 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -133,9 +133,9 @@ func Templates(linter *support.Linter) {
 			// if kubernetes server is unavailable print a warning
 			// and don't try again this run.
 			timeout := time.Duration(5 * time.Second)
-			_, err = net.DialTimeout("tcp" , u.Host , timeout)
+			_, err = net.DialTimeout("tcp", u.Host, timeout)
 			if err != nil {
-				e := fmt.Errorf("%s, skipping schema validation\n", err)
+				e := fmt.Errorf("skipping schema validation\n\t%s", err)
 				linter.RunLinterRule(support.WarningSev, path, e)
 				serverAvailable = false
 				continue
diff --git a/pkg/lint/rules/template_test.go b/pkg/lint/rules/template_test.go
index 0099acedf..b70be5ad8 100644
--- a/pkg/lint/rules/template_test.go
+++ b/pkg/lint/rules/template_test.go
@@ -72,8 +72,12 @@ func TestTemplateIntegrationHappyPath(t *testing.T) {
 	Templates(&linter)
 	res := linter.Messages
 
-	// expect no errors and one warning indicating no server is available
-	if len(res) != 1 && linter.Messages[0].Severity != support.WarningSev {
-		t.Fatalf("Expected one warning and no error, got %d, %v", len(res), res)
+	// expect one warning indicating no server is available
+	if len(res) != 1 {
+		t.Fatalf("expected one warning, got %d, %v", len(res), res)
+	}
+
+	if linter.HighestSeverity != support.WarningSev {
+		t.Fatalf("expected warning severity, got %d, %v", linter.HighestSeverity, res)
 	}
 }