From 4f972daa2b842822ed80d0d1546901396617690e Mon Sep 17 00:00:00 2001
From: Sven Rebhan <36194019+srebhan@users.noreply.github.com>
Date: Mon, 23 May 2022 21:01:53 +0200
Subject: [PATCH] test: avoid data race in tcp-listener test (#11144)

---
 .../inputs/tcp_listener/tcp_listener_test.go  | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/plugins/inputs/tcp_listener/tcp_listener_test.go b/plugins/inputs/tcp_listener/tcp_listener_test.go
index e59115e6738b7..2bd54da15b955 100644
--- a/plugins/inputs/tcp_listener/tcp_listener_test.go
+++ b/plugins/inputs/tcp_listener/tcp_listener_test.go
@@ -1,14 +1,9 @@
 package tcp_listener
 
 import (
-	"bufio"
-	"bytes"
 	"fmt"
 	"io"
-	"log"
 	"net"
-	"os"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -255,30 +250,22 @@ func TestRunParser(t *testing.T) {
 	)
 }
 
-func TestRunParserInvalidMsg(_ *testing.T) {
+func TestRunParserInvalidMsg(t *testing.T) {
 	var testmsg = []byte("cpu_load_short")
 
 	listener, in := newTestTCPListener()
-	acc := testutil.Accumulator{}
-	listener.acc = &acc
-	defer close(listener.done)
+	listener.Log = &testutil.CaptureLogger{}
+	listener.acc = &testutil.Accumulator{}
 
 	listener.parser, _ = parsers.NewInfluxParser()
 	listener.wg.Add(1)
 
-	buf := bytes.NewBuffer(nil)
-	log.SetOutput(buf)
-	defer log.SetOutput(os.Stderr)
-
 	go listener.tcpParser()
 	in <- testmsg
 
-	scnr := bufio.NewScanner(buf)
-	for scnr.Scan() {
-		if strings.Contains(scnr.Text(), "tcp_listener has received 1 malformed packets thus far.") {
-			break
-		}
-	}
+	listener.Stop()
+	errmsg := listener.Log.(*testutil.CaptureLogger).LastError
+	require.Contains(t, errmsg, "tcp_listener has received 1 malformed packets thus far.")
 }
 
 func TestRunParserGraphiteMsg(t *testing.T) {