From 538e8297ef1440bac69c218a1233ace6f2106c36 Mon Sep 17 00:00:00 2001
From: Michelle Noorali <michelle@deis.com>
Date: Mon, 6 Feb 2017 10:39:57 -0500
Subject: [PATCH] ref(*): add namespace info to failing test msg

* also cleanup comments
---
 _proto/hapi/services/tiller.proto     | 6 ++----
 cmd/helm/release_testing.go           | 2 +-
 pkg/releasetesting/environment.go     | 4 ++--
 pkg/releasetesting/test_suite.go      | 4 ++--
 pkg/releasetesting/test_suite_test.go | 2 +-
 pkg/tiller/release_server_test.go     | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/_proto/hapi/services/tiller.proto b/_proto/hapi/services/tiller.proto
index 572e39be0..09799a240 100644
--- a/_proto/hapi/services/tiller.proto
+++ b/_proto/hapi/services/tiller.proto
@@ -79,8 +79,7 @@ service ReleaseService {
     rpc GetHistory(GetHistoryRequest) returns (GetHistoryResponse) {
     }
 
-    //TODO: move this to a test release service or rename to RunReleaseTest
-    // TestRelease runs the tests for a given release
+    // RunReleaseTest executes the tests defined of a named release
     rpc RunReleaseTest(TestReleaseRequest) returns (stream TestReleaseResponse) {
     }
 }
@@ -318,8 +317,7 @@ message TestReleaseRequest {
 	int64 timeout = 2;
 }
 
-// TestReleaseResponse
+// TestReleaseResponse represents a message from executing a test
 message TestReleaseResponse {
-	// TODO: change to repeated hapi.release.Release.Test results = 1; (for stream)
 	string msg = 1;
 }
diff --git a/cmd/helm/release_testing.go b/cmd/helm/release_testing.go
index 13af3641d..0a2ce683d 100644
--- a/cmd/helm/release_testing.go
+++ b/cmd/helm/release_testing.go
@@ -26,7 +26,7 @@ import (
 )
 
 const releaseTestDesc = `
-Th test command runs the tests for a release.
+The test command runs the tests for a release.
 
 The argument this command takes is the name of a deployed release.
 The tests to be run are defined in the chart that was installed.
diff --git a/pkg/releasetesting/environment.go b/pkg/releasetesting/environment.go
index 565d4ab0e..0b409856f 100644
--- a/pkg/releasetesting/environment.go
+++ b/pkg/releasetesting/environment.go
@@ -43,8 +43,8 @@ func streamError(info string, stream services.ReleaseService_RunReleaseTestServe
 	return err
 }
 
-func streamFailed(name string, stream services.ReleaseService_RunReleaseTestServer) error {
-	msg := fmt.Sprintf("FAILED: %s, run `kubectl logs %s` for more info", name, name)
+func streamFailed(name, namespace string, stream services.ReleaseService_RunReleaseTestServer) error {
+	msg := fmt.Sprintf("FAILED: %s, run `kubectl logs %s --namespace %s` for more info", name, name, namespace)
 	err := streamMessage(msg, stream)
 	return err
 }
diff --git a/pkg/releasetesting/test_suite.go b/pkg/releasetesting/test_suite.go
index d5c9f6346..6bcf1c96d 100644
--- a/pkg/releasetesting/test_suite.go
+++ b/pkg/releasetesting/test_suite.go
@@ -103,10 +103,10 @@ func (t *TestSuite) Run(env *Environment) error {
 			}
 		} else if resourceCreated && resourceCleanExit && status == api.PodFailed {
 			test.result.Status = release.TestRun_FAILURE
-			if streamErr := streamFailed(test.result.Name, env.Stream); streamErr != nil {
+			if streamErr := streamFailed(test.result.Name, env.Namespace, env.Stream); streamErr != nil {
 				return err
 			}
-		} //else if resourceCreated && resourceCleanExit && status == api.PodUnkown {
+		}
 
 		test.result.CompletedAt = timeconv.Now()
 		t.Results = append(t.Results, test.result)
diff --git a/pkg/releasetesting/test_suite_test.go b/pkg/releasetesting/test_suite_test.go
index 446b63e2a..5f1151e5f 100644
--- a/pkg/releasetesting/test_suite_test.go
+++ b/pkg/releasetesting/test_suite_test.go
@@ -128,7 +128,7 @@ kind: Pod
 metadata:
   name: finding-nemo,
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": test-success
 spec:
   containers:
   - name: nemo-test
diff --git a/pkg/tiller/release_server_test.go b/pkg/tiller/release_server_test.go
index da11ef02e..5cf6024f8 100644
--- a/pkg/tiller/release_server_test.go
+++ b/pkg/tiller/release_server_test.go
@@ -58,7 +58,7 @@ kind: Pod
 metadata:
   name: finding-nemo,
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": test-success
 spec:
   containers:
   - name: nemo-test