remove skips for fixed tests

Signed-off-by: Zack Train <ztrain@uber.com>
spiffe · Mar 11, 2022 · ecff992 · ecff992
1 parent 851c266
commit ecff992
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/.github/workflows/scripts/run_unit_tests_under_race_detector.sh b/.github/workflows/scripts/run_unit_tests_under_race_detector.sh
@@ -8,10 +8,7 @@ if [ -n "${COVERALLS_TOKEN}" ]; then
     go get github.com/mattn/goveralls@v0.0.7
 fi
 
-COVERPROFILE="${COVERPROFILE}" \
-    SKIP_FLAKY_TESTS_UNDER_RACE_CONDITION=1 \
-    GOVERBOSE=1 \
-    make race-test
+COVERPROFILE="${COVERPROFILE}" make ci-race-test
 
 if [ -n "${COVERALLS_TOKEN}" ]; then
     "$(go env GOPATH)"/bin/goveralls -coverprofile="${COVERPROFILE}" \

diff --git a/Makefile b/Makefile
@@ -280,9 +280,16 @@ endif
 
 race-test: | go-check
 ifneq ($(COVERPROFILE),)
-	$(E)SKIP_FLAKY_TESTS=1 $(go_path) go test $(go_flags) $(go_test_flags) -race -count=1 -coverprofile="$(COVERPROFILE)" ./...
+	$(E)$(go_path) go test $(go_flags) $(go_test_flags) -race -coverprofile="$(COVERPROFILE)" ./...
 else
-	$(E)SKIP_FLAKY_TESTS=1 $(go_path) go test $(go_flags) $(go_test_flags) -race -count=1 ./...
+	$(E)$(go_path) go test $(go_flags) $(go_test_flags) -race ./...
+endif
+
+ci-race-test: | go-check
+ifneq ($(COVERPROFILE),)
+	$(E)SKIP_FLAKY_TESTS_UNDER_RACE_TEST=1 $(go_path) go test $(go_flags) $(go_test_flags) -race -count=1 -coverprofile="$(COVERPROFILE)" ./...
+else
+	$(E)SKIP_FLAKY_TESTS_UNDER_RACE_TEST=1 $(go_path) go test $(go_flags) $(go_test_flags) -race -count=1 ./...
 endif
 
 integration:

diff --git a/pkg/agent/plugin/nodeattestor/tpmdevid/devid_test.go b/pkg/agent/plugin/nodeattestor/tpmdevid/devid_test.go
@@ -22,7 +22,6 @@ import (
 	server_devid "github.com/spiffe/spire/pkg/server/plugin/nodeattestor/tpmdevid"
 	"github.com/spiffe/spire/test/plugintest"
 	"github.com/spiffe/spire/test/tpmsimulator"
-	"github.com/spiffe/spire/test/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -347,11 +346,6 @@ func TestConfigureWindows(t *testing.T) {
 }
 
 func TestAidAttestationFailures(t *testing.T) {
-	util.SkipFlakyTestUnderRaceDetectorWithFiledIssue(
-		t,
-		"https://github.com/spiffe/spire/issues/2711",
-	)
-
 	tests := []struct {
 		name                              string
 		openTPMFail                       bool

diff --git a/pkg/agent/svid/rotator_test.go b/pkg/agent/svid/rotator_test.go
@@ -21,17 +21,11 @@ import (
 	"github.com/spiffe/spire/test/clock"
 	"github.com/spiffe/spire/test/fakes/fakeagentkeymanager"
 	"github.com/spiffe/spire/test/testca"
-	"github.com/spiffe/spire/test/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestRotator(t *testing.T) {
-	util.SkipFlakyTestUnderRaceDetectorWithFiledIssue(
-		t,
-		"https://github.com/spiffe/spire/issues/2713",
-	)
-
 	caCert, caKey := testca.CreateCACertificate(t, nil, nil)
 
 	for _, tt := range []struct {

diff --git a/pkg/server/plugin/keymanager/awskms/awskms_test.go b/pkg/server/plugin/keymanager/awskms/awskms_test.go
@@ -25,7 +25,6 @@ import (
 	keymanagertest "github.com/spiffe/spire/pkg/server/plugin/keymanager/test"
 	"github.com/spiffe/spire/test/plugintest"
 	"github.com/spiffe/spire/test/spiretest"
-	"github.com/spiffe/spire/test/util"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 )
@@ -344,11 +343,6 @@ func TestConfigure(t *testing.T) {
 }
 
 func TestGenerateKey(t *testing.T) {
-	util.SkipFlakyTestUnderRaceDetectorWithFiledIssue(
-		t,
-		"https://github.com/spiffe/spire/issues/2714",
-	)
-
 	for _, tt := range []struct {
 		name                   string
 		err                    string