Require every unit test on a PR to pass 3 runs

scylladb · Feb 11, 2021 · 57f8f4e · 57f8f4e
1 parent 009c290
commit 57f8f4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
@@ -64,6 +64,10 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build
       run: make --warn-undefined-variables
+    - name: Make sure new unit tests aren't flaky
+      if: ${{ github.event_name == 'pull_request' }}
+      run: |
+        echo "GO_TEST_COUNT=-count=3" | tee -a ${GITHUB_ENV}
     - name: Test
       run: make test --warn-undefined-variables
 

diff --git a/Makefile b/Makefile
@@ -38,6 +38,7 @@ GO_BUILD_BINDIR ?=
 GO_LD_EXTRA_FLAGS ?=
 GO_TEST_PACKAGES :=./pkg/... # ./cmd/...
 GO_TEST_FLAGS ?=-race
+GO_TEST_COUNT ?=
 GO_TEST_EXTRA_FLAGS ?=
 GO_TEST_ARGS ?=
 GO_TEST_EXTRA_ARGS ?=
@@ -155,11 +156,12 @@ update: update-gofmt
 .PHONY: update
 
 test-unit:
-	$(GO) test $(GO_TEST_FLAGS) $(GO_TEST_EXTRA_FLAGS) $(GO_TEST_PACKAGES) $(if $(GO_TEST_ARGS)$(GO_TEST_EXTRA_ARGS),-args $(GO_TEST_ARGS) $(GO_TEST_EXTRA_ARGS))
+	$(GO) test $(GO_TEST_COUNT) $(GO_TEST_FLAGS) $(GO_TEST_EXTRA_FLAGS) $(GO_TEST_PACKAGES) $(if $(GO_TEST_ARGS)$(GO_TEST_EXTRA_ARGS),-args $(GO_TEST_ARGS) $(GO_TEST_EXTRA_ARGS))
 .PHONY: test-unit
 
 test-integration: GO_TEST_PACKAGES :=./test/integration/...
-test-integration: GO_TEST_FLAGS += -count=1 -p=1 -timeout 30m -v
+test-integration: GO_TEST_COUNT :=-count=1
+test-integration: GO_TEST_FLAGS += -p=1 -timeout 30m -v
 test-integration: GO_TEST_ARGS += -ginkgo.progress
 test-integration: test-unit
 .PHONY: test-integration