Update: Test avoiding race conditions for RFC5426 (syslog input plugin)

influxdata · May 25, 2018 · 625d18b · 625d18b
1 parent 716da76
commit 625d18b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/plugins/inputs/syslog/rfc5425_test.go b/plugins/inputs/syslog/rfc5425_test.go
@@ -345,7 +345,7 @@ func getTestCasesForRFC5425() []testCase5425 {
 
 func newTCPSyslogReceiver(address string, keepAlive *internal.Duration, maxConn int, bestEffort bool) *Syslog {
 	d := &internal.Duration{
-		Duration: 50 * time.Millisecond,
+		Duration: defaultReadTimeout,
 	}
 	s := &Syslog{
 		Address: address,

diff --git a/plugins/inputs/syslog/rfc5426_test.go b/plugins/inputs/syslog/rfc5426_test.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -285,9 +286,10 @@ func TestStrict_unixgram(t *testing.T) {
 }
 
 func TestTimeIncrement_udp(t *testing.T) {
-	i := 0
+	var i int64
+	atomic.StoreInt64(&i, 0)
 	getNow := func() time.Time {
-		if i%2 == 0 {
+		if atomic.LoadInt64(&i)%2 == 0 {
 			return time.Unix(1, 0)
 		}
 		return time.Unix(1, 1)
@@ -336,7 +338,7 @@ func TestTimeIncrement_udp(t *testing.T) {
 	}
 
 	// New one with different time
-	i++
+	atomic.StoreInt64(&i, atomic.LoadInt64(&i)+1)
 
 	// Clear
 	acc.ClearMetrics()