From 8fb35d6c2495f3b4610bd1d320e63e8891f78069 Mon Sep 17 00:00:00 2001
From: Oliver Beattie <oliver@obeattie.com>
Date: Sun, 17 Aug 2014 17:34:01 +0100
Subject: [PATCH] Fix up TestSuiteLogging in verbose mode

---
 suite/suite_test.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/suite/suite_test.go b/suite/suite_test.go
index 41e53a7..104b9f5 100644
--- a/suite/suite_test.go
+++ b/suite/suite_test.go
@@ -116,7 +116,7 @@ func (s *SuiteLoggingTester) TestLoggingPass() {
 
 func (s *SuiteLoggingTester) TestLoggingFail() {
 	s.T().Log("TESTLOGFAIL")
-	assert.NotNil(s.T(), nil) //expected to fail
+	assert.NotNil(s.T(), nil) // expected to fail
 }
 
 type StdoutCapture struct {
@@ -154,6 +154,13 @@ func TestSuiteLogging(t *testing.T) {
 
 	assert.Nil(t, err, "Got an error trying to capture stdout!")
 
+	// Failed tests' output is always printed
 	assert.Contains(t, output, "TESTLOGFAIL")
-	assert.NotContains(t, output, "TESTLOGPASS")
+
+	if testing.Verbose() {
+		// In verbose mode, output from successful tests is also printed
+		assert.Contains(t, output, "TESTLOGPASS")
+	} else {
+		assert.NotContains(t, output, "TESTLOGPASS")
+	}
 }