unit test coverage respects UNIT_PACKAGES, other minor fixes

Author: ag

test.sh

@@ -239,9 +239,11 @@ if [[ "${RUN[@]}" =~ "$STAGE" ]] ; then
   print_heading "Running Unit Tests"
   flush_redis
 
-  if [ "$COVERAGE" == "true" ]; then
-    export GOFLAGS="-cover -covermode=atomic -coverprofile=${COVERAGE_DIR}/unit.coverprofile -coverpkg=./..."
+  if [ "${COVERAGE}" == "true" ]; then
+    UNIT_CSV=$(IFS=,; echo "${UNIT_PACKAGES[*]}")
+    UNIT_FLAGS+=("-cover" "-covermode=atomic" "-coverprofile=${COVERAGE_DIR}/unit.coverprofile" "-coverpkg=${UNIT_CSV}")
   fi
+
   run_unit_tests
 fi
 
@@ -265,7 +267,6 @@ if [[ "${RUN[@]}" =~ "$STAGE" ]] ; then
 
   # Add coverage settings if enabled
   if [ "${COVERAGE}" == "true" ]; then
-    # export GOFLAGS="-cover -covermode=atomic -coverprofile=${COVERAGE_DIR}/integration.coverprofile -coverpkg=./..."
     INTEGRATION_ARGS+=("--coverage" "--coverage-dir=${COVERAGE_DIR}")
   fi
 

test/integration-test.py

@@ -173,7 +173,7 @@ def process_covdata(coverage_dir):
     cov_text = os.path.join(coverage_dir, "integration.coverprofile")
     # this works, but if it takes a long time consider merging with `go tool covdata merge` first
     # https://go.dev/blog/integration-test-coverage#merging-raw-profiles-with-go-tool-covdata-merge
-    subprocess.check_call(["go", "tool", "covdata", "textfmt", "-i", coverage_dir, "-o", cov_text])
+    run(["go", "tool", "covdata", "textfmt", "-i", coverage_dir, "-o", cov_text])
 
 if __name__ == "__main__":
     main()