Move checking of log message to a separate CacheLogrusHook method

Resolves #130 (comment)

Author: Ivan Mirić

common/remote_object_test.go

@@ -256,13 +256,7 @@ func TestParseRemoteObject(t *testing.T) {
 			assert.Equal(t, tc.expected, val)
 
 			if tc.name == "overflow" {
-				var gotMsg bool
-				for _, evt := range logHook.Drain() {
-					if evt.Message == "object will be parsed partially" {
-						gotMsg = true
-					}
-				}
-				assert.True(t, gotMsg)
+				assert.True(t, logHook.Contains("object will be parsed partially"))
 			}
 		})
 	}

tests/network_manager_test.go

@@ -41,11 +41,5 @@ func TestDataURLSkipRequest(t *testing.T) {
 
 	p.Goto("data:text/html,hello", nil)
 
-	var gotMsg bool
-	for _, evt := range logHook.Drain() {
-		if evt.Message == "skipped request handling of data URL" {
-			gotMsg = true
-		}
-	}
-	assert.True(t, gotMsg)
+	assert.True(t, logHook.Contains("skipped request handling of data URL"))
 }

testutils/logrus_hook.go

@@ -22,6 +22,7 @@ package testutils
 
 import (
 	"io/ioutil"
+	"strings"
 	"sync"
 
 	"github.com/sirupsen/logrus"
@@ -31,32 +32,45 @@ import (
 // if log messages were outputted
 type CacheLogrusHook struct {
 	HookedLevels []logrus.Level
-	mutex        sync.Mutex
+	mutex        sync.RWMutex
 	messageCache []logrus.Entry
 }
 
 // Levels just returns whatever was stored in the HookedLevels slice
-func (smh *CacheLogrusHook) Levels() []logrus.Level {
-	return smh.HookedLevels
+func (clh *CacheLogrusHook) Levels() []logrus.Level {
+	return clh.HookedLevels
 }
 
 // Fire saves whatever message the logrus library passed in the cache
-func (smh *CacheLogrusHook) Fire(e *logrus.Entry) error {
-	smh.mutex.Lock()
-	defer smh.mutex.Unlock()
-	smh.messageCache = append(smh.messageCache, *e)
+func (clh *CacheLogrusHook) Fire(e *logrus.Entry) error {
+	clh.mutex.Lock()
+	defer clh.mutex.Unlock()
+	clh.messageCache = append(clh.messageCache, *e)
 	return nil
 }
 
 // Drain returns the currently stored messages and deletes them from the cache
-func (smh *CacheLogrusHook) Drain() []logrus.Entry {
-	smh.mutex.Lock()
-	defer smh.mutex.Unlock()
-	res := smh.messageCache
-	smh.messageCache = []logrus.Entry{}
+func (clh *CacheLogrusHook) Drain() []logrus.Entry {
+	clh.mutex.Lock()
+	defer clh.mutex.Unlock()
+	res := clh.messageCache
+	clh.messageCache = []logrus.Entry{}
 	return res
 }
 
+// Contains returns true if msg is contained in any of the cached logged events
+// or false otherwise.
+func (clh *CacheLogrusHook) Contains(msg string) bool {
+	clh.mutex.RLock()
+	defer clh.mutex.RUnlock()
+	for _, evt := range clh.messageCache {
+		if strings.Contains(evt.Message, msg) {
+			return true
+		}
+	}
+	return false
+}
+
 var _ logrus.Hook = &CacheLogrusHook{}
 
 // LogHook sets logger to DebugLevel, attaches a CacheLogrusHook and returns it.