test: separate tests from coverage

Signed-off-by: Daniel Vérité <[email protected]>

Author: dverite

.github/workflows/test.yaml

@@ -27,26 +27,7 @@ jobs:
         run: make build
       - name: Run Go tests
         run: make test
-      - name: Code Coverage Report
-        uses: irongut/[email protected]
-        with:
-          filename: coverage.xml
-          badge: true
-          fail_below_min: false
-          format: markdown
-          hide_branch_rate: false
-          hide_complexity: true
-          indicators: true
-          output: both
-          thresholds: '60 80'
-      - uses: jwalton/gh-find-current-pr@v1
-        id: finder
-      - name: Add Coverage PR Comment
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:
-          number: ${{ steps.finder.outputs.pr }}
-          path: code-coverage-results.md
-          recreate: true
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
@@ -156,6 +137,72 @@ jobs:
       - name: Run Debian package tests
         run: make debian-test-ci
 
+  coverage:
+    name: Test Coverage
+    needs: go
+    runs-on: ubuntu-latest
+    env:
+      BATS_LIB_PATH: "${{ github.workspace }}/test/bats/lib/"
+      PGHOST: localhost
+      PGUSER: postgres
+      PGPASSWORD: hackme
+      PGDATABASE: unittest
+    services:
+      postgres:
+        image: postgres:14
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+          --hostname postgres
+        env:
+          POSTGRES_PASSWORD: hackme
+        ports:
+          - 5432:5432
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+      - name: Install dependencies
+        run: |
+          go get .
+      - name: Build
+        run: make build
+
+      - name: Setup Bats and bats libs
+        uses: bats-core/[email protected]
+        with:
+          support-path: ${{ github.workspace }}/test/bats/lib/bats-support
+          assert-path: ${{ github.workspace }}/test/bats/lib/bats-assert
+          file-install: false  # Unused
+          detik-install: false  # Unused
+
+      - name: Run Go and e2e tests
+        run: make coverage
+
+      - name: Code Coverage Report
+        uses: irongut/[email protected]
+        with:
+          filename: coverage.xml
+          badge: true
+          fail_below_min: false
+          format: markdown
+          hide_branch_rate: false
+          hide_complexity: true
+          indicators: true
+          output: both
+          thresholds: '60 80'
+      - uses: jwalton/gh-find-current-pr@v1
+        id: finder
+      - name: Add Coverage PR Comment
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          number: ${{ steps.finder.outputs.pr }}
+          path: code-coverage-results.md
+          recreate: true
+
 #  checkcov:
 #    permissions:
 #      security-events: write  # for github/codeql-action/upload-sarif to upload SARIF results

Makefile

@@ -19,6 +19,17 @@ format:
 build:
 	CGO_ENABLED=0 go build -v -ldflags="-X '$(BUILD_INFO_PACKAGE_PATH).Version=development' -X '$(BUILD_INFO_PACKAGE_PATH).CommitSHA=$(GIT_COMMIT_SHA)' -X '$(BUILD_INFO_PACKAGE_PATH).Date=$(BUILD_DATE)'" -o $(BINARY)
 
+coverage: $(COVER_BINARY) test
+	test -d ./coverage-data || mkdir ./coverage-data
+	rm -f ./coverage-data/cov*
+# run e2e test collecting coverage data
+	cd scripts/bats && GOCOVERDIR=$(PWD)/coverage-data bats *.bats
+# merge go-test and e2e-tests collected data
+	go tool covdata textfmt -i=./coverage-data -o coverage.txt
+	go run github.com/boumenot/gocover-cobertura@latest < coverage.txt > coverage.xml
+	go tool cover -html coverage.txt -o cover.html
+
+
 # build for coverage
 $(COVER_BINARY): build
 	CGO_ENABLED=0 go build -cover -v -ldflags="-X '$(BUILD_INFO_PACKAGE_PATH).Version=development' -X '$(BUILD_INFO_PACKAGE_PATH).CommitSHA=$(GIT_COMMIT_SHA)' -X '$(BUILD_INFO_PACKAGE_PATH).Date=$(BUILD_DATE)'" -o $(COVER_BINARY)
@@ -31,7 +42,8 @@ run:
 install: build
 	GOBIN=/usr/local/bin/ go install -v -ldflags="-X '$(BUILD_INFO_PACKAGE_PATH).Version=development' -X '$(BUILD_INFO_PACKAGE_PATH).CommitSHA=$(GIT_COMMIT_SHA)' -X '$(BUILD_INFO_PACKAGE_PATH).Date=$(BUILD_DATE)'"
 
-bats-test: $(COVER_BINARY)
+.PHONY: bats-test
+bats-test: build $(COVER_BINARY)
 	test -d ./coverage-data || mkdir ./coverage-data
 	cd scripts/bats && GOCOVERDIR=$(PWD)/coverage-data bats *.bats
 
@@ -66,10 +78,8 @@ checkcov:
 .PHONY: test
 test:
 	test -d ./coverage-data || mkdir ./coverage-data
+	rm -f ./coverage-data/cov*
 	go test -v ./... -cover -test.gocoverdir=$(PWD)/coverage-data -covermode set
-	go tool covdata textfmt -i=./coverage-data -o coverage.txt
-	go run github.com/boumenot/gocover-cobertura@latest < coverage.txt > coverage.xml
-	go tool cover -html coverage.txt -o cover.html
 
 .PHONY: lint
 lint: