Merge branch 'jc-remove-test-hooks' into 'master'

Remove test hooks

Closes #2096

See merge request gitlab-org/gitaly!1567

1 files changed, 1 insertions, 39 deletions

diff --git a/internal/testhelper/test_hook.go b/internal/testhelper/test_hook.go
index 93d229a2a..448dd2c5b 100644
--- a/internal/testhelper/test_hook.go
+++ b/internal/testhelper/test_hook.go
@@ -7,48 +7,10 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-type testHook struct {
-	t         testing.TB
-	formatter log.Formatter
-}
-
-func (s testHook) Levels() []log.Level {
-	return []log.Level{
-		log.DebugLevel,
-		log.InfoLevel,
-		log.WarnLevel,
-		log.ErrorLevel,
-		log.FatalLevel,
-		log.PanicLevel,
-	}
-}
-
-func (s testHook) Fire(entry *log.Entry) error {
-	formatted, err := s.formatter.Format(entry)
-	if err != nil {
-		return err
-	}
-
-	formattedString := string(formatted)
-
-	switch entry.Level {
-	case log.FatalLevel, log.PanicLevel:
-		s.t.Fatal(formattedString)
-
-	default:
-		s.t.Log(formattedString)
-	}
-
-	return nil
-}
-
-// NewTestLogger created a logrus hook which can be used with testing logs
+// NewTestLogger created a logrus hook
 func NewTestLogger(tb testing.TB) *log.Logger {
 	logger := log.New()
 	logger.Out = ioutil.Discard
-	formatter := &log.TextFormatter{}
-
-	logger.Hooks.Add(testHook{tb, formatter})
 
 	return logger
 }