diff --git a/Makefile b/Makefile index b30b656d411d5cb9db252d12c517ea264d5b69da..131cfe1fd688ed96440a571448d8b348c2674000 100644 --- a/Makefile +++ b/Makefile @@ -267,7 +267,7 @@ find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -path "${SO run_go_tests = PATH='${SOURCE_DIR}/internal/testhelper/testdata/home/bin:${PATH}' \ TEST_TMP_DIR='${TEST_TMP_DIR}' \ TEST_LOG_DIR='${TEST_LOG_DIR}' \ - ${GOTESTSUM} --format ${TEST_FORMAT} --junitfile '${TEST_JUNIT_REPORT}' --jsonfile '${TEST_JSON_REPORT}' -- -ldflags '${GO_LDFLAGS}' -tags '${SERVER_BUILD_TAGS}' ${TEST_OPTIONS} ${TEST_PACKAGES} + ${GOTESTSUM} --format ${TEST_FORMAT} --junitfile '${TEST_JUNIT_REPORT}' --jsonfile '${TEST_JSON_REPORT}' --rerun-fails --packages="${TEST_PACKAGES}" -- -ldflags '${GO_LDFLAGS}' -tags '${SERVER_BUILD_TAGS}' ${TEST_OPTIONS} ## Test options passed to `dlv test`. DEBUG_OPTIONS ?= $(patsubst -%,-test.%,${TEST_OPTIONS}) diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go index 88ab9dbad5e61fc54fc51dec32c2d058b1489e24..d40af7650bd266958c45a867ae1f2ddb94636ae6 100644 --- a/internal/praefect/coordinator_test.go +++ b/internal/praefect/coordinator_test.go @@ -1828,6 +1828,8 @@ func TestAbsentCorrelationID(t *testing.T) { } func TestCoordinatorEnqueueFailure(t *testing.T) { + testhelper.SkipWithMacOS(t, "this test is extremely flaky on macos platform") + t.Parallel() conf := config.Config{ VirtualStorages: []*config.VirtualStorage{ diff --git a/internal/praefect/server_test.go b/internal/praefect/server_test.go index 70916f0dc5a41e33110f38f0c7f31d8efd27f843..6de18fd257dcd7a69463ee56c131feb1d8bf1bd6 100644 --- a/internal/praefect/server_test.go +++ b/internal/praefect/server_test.go @@ -936,6 +936,7 @@ func TestProxyWrites(t *testing.T) { } func TestErrorThreshold(t *testing.T) { + testhelper.SkipWithMacOS(t, "this test is extremely flaky on macos platform") t.Parallel() backendToken := "" backend, cleanup := newMockDownstream(t, backendToken, func(srv *grpc.Server) {