From 69dea8659d71ede878f8a047bcb28c4e03c27afc Mon Sep 17 00:00:00 2001
From: Alex Shtin <alex@temporal.io>
Date: Mon, 27 Apr 2020 16:12:27 -0700
Subject: [PATCH] Add race detector to tests (#109)

---
 Makefile                          | 3 +++
 internal/internal_task_pollers.go | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 94d0ff0a8..9962593e1 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,9 @@ IMPORT_ROOT := go.temporal.io/temporal
 # general build-product folder, cleaned as part of `make clean`
 BUILD := .build
 
+TEST_TIMEOUT := 2m
+TEST_ARG ?= -race -v -timeout $(TEST_TIMEOUT)
+
 INTEG_TEST_ROOT := ./test
 COVER_ROOT := $(BUILD)/coverage
 UT_COVER_FILE := $(COVER_ROOT)/unit_test_cover.out
diff --git a/internal/internal_task_pollers.go b/internal/internal_task_pollers.go
index b98e360a7..0ebf62bec 100644
--- a/internal/internal_task_pollers.go
+++ b/internal/internal_task_pollers.go
@@ -36,15 +36,14 @@ import (
 	"github.com/opentracing/opentracing-go"
 	"github.com/pborman/uuid"
 	"github.com/uber-go/tally"
-	filterpb "go.temporal.io/temporal-proto/filter"
 	commonpb "go.temporal.io/temporal-proto/common"
-	"go.uber.org/zap"
-
 	decisionpb "go.temporal.io/temporal-proto/decision"
 	eventpb "go.temporal.io/temporal-proto/event"
 	executionpb "go.temporal.io/temporal-proto/execution"
+	filterpb "go.temporal.io/temporal-proto/filter"
 	tasklistpb "go.temporal.io/temporal-proto/tasklist"
 	"go.temporal.io/temporal-proto/workflowservice"
+	"go.uber.org/zap"
 
 	"go.temporal.io/temporal/internal/common"
 	"go.temporal.io/temporal/internal/common/backoff"