fix_: fix test coverage when rerunning tests

Author: igor-sirotin

Makefile

@@ -366,6 +366,7 @@ test-unit: export UNIT_TEST_PACKAGES_NOT_PARALLELIZABLE ?= \
 test-unit: export UNIT_TEST_PACKAGES_WITH_EXTENDED_TIMEOUT ?= \
 	github.com/status-im/status-go/protocol
 test-unit: ##@tests Run unit and integration tests
+	go install github.com/wadey/gocovmerge@latest
 	./_assets/scripts/run_unit_tests.sh
 
 test-unit-race: export GOTEST_EXTRAFLAGS=-race

_assets/scripts/run_unit_tests.sh

@@ -79,15 +79,24 @@ run_test_for_package() {
     gotestsum_flags="${gotestsum_flags} --junitfile=${report_file} --rerun-fails-report=${rerun_report_file}"
   fi
 
-  gotestsum --packages="${package}" ${gotestsum_flags} -- \
+  # Cleanup previous coverage reports
+  rm -f ${package_dir}/coverage.out.rerun.*
+
+  PACKAGE_DIR=${package_dir} gotestsum --packages="${package}" ${gotestsum_flags} --raw-command -- \
+    ./_assets/scripts/test-with-coverage.sh \
+    ${package} \
     -v ${GOTEST_EXTRAFLAGS} \
     -timeout "${package_timeout}" \
     -count 1 \
-    -tags "${BUILD_TAGS}" \
-    -covermode=atomic \
-    -coverprofile="${coverage_file}" | \
+    -tags "${BUILD_TAGS}" |
     redirect_stdout "${output_file}"
 
+  # Merge package coverage results
+  gocovmerge ${package_dir}/coverage.out.rerun.* > ${coverage_file}
+
+  # Cleanup coverage reports
+  rm -f ${package_dir}/coverage.out.rerun.*
+
   local go_test_exit=$?
   echo "${go_test_exit}" > "${exit_code_file}"
   if [[ "${go_test_exit}" -ne 0 ]]; then

_assets/scripts/test-with-coverage.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -eu
+coverage_file_path="${PACKAGE_DIR}/$(mktemp coverage.out.rerun.XXXXXXXXXX)"
+go test -json \
+  -covermode=atomic \
+  -coverprofile="${coverage_file_path}" \
+  "$@"