Skip to content

Commit

Permalink
test: avoid data race in tcp-listener test (#11144)
Browse files Browse the repository at this point in the history
  • Loading branch information
srebhan authored May 23, 2022
1 parent 0ff3b63 commit 4f972da
Showing 1 changed file with 6 additions and 19 deletions.
25 changes: 6 additions & 19 deletions plugins/inputs/tcp_listener/tcp_listener_test.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
package tcp_listener

import (
"bufio"
"bytes"
"fmt"
"io"
"log"
"net"
"os"
"strings"
"testing"

"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 4f972da

Please sign in to comment.