Skip to content

acc: fix sporadic errors in 'make cover' #2870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denik merged 2 commits into from
May 14, 2025
Merged

acc: fix sporadic errors in 'make cover' #2870

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f93f179
acc: fix sporadic errors in 'make cover'
denik May 13, 2025
03a8cb8
lint fix
denik May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions acceptance/acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"runtime"
"slices"
"sort"
"strconv"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -241,15 +242,15 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
if len(expanded[0]) > 0 {
t.Logf("Running test with env %v", expanded[0])
}
runTest(t, dir, coverDir, repls.Clone(), config, configPath, expanded[0], inprocessMode)
runTest(t, dir, 0, coverDir, repls.Clone(), config, configPath, expanded[0], inprocessMode)
} else {
for _, envset := range expanded {
for ind, envset := range expanded {
envname := strings.Join(envset, "/")
t.Run(envname, func(t *testing.T) {
if !inprocessMode {
t.Parallel()
}
runTest(t, dir, coverDir, repls.Clone(), config, configPath, envset, inprocessMode)
runTest(t, dir, ind, coverDir, repls.Clone(), config, configPath, envset, inprocessMode)
})
}
}
Expand Down Expand Up @@ -342,7 +343,9 @@ func getSkipReason(config *internal.TestConfig, configPath string) string {
}

func runTest(t *testing.T,
dir, coverDir string,
dir string,
variant int,
coverDir string,
repls testdiff.ReplacementsContext,
config internal.TestConfig,
configPath string,
Expand Down Expand Up @@ -429,7 +432,11 @@ func runTest(t *testing.T,
// Creating individual coverage directory for each test, because writing to the same one
// results in sporadic failures like this one (only if tests are running in parallel):
// +error: coverage meta-data emit failed: writing ... rename .../tmp.covmeta.b3f... .../covmeta.b3f2c...: no such file or directory
// Note: should not use dir, because single dir can generate multiple tests via EnvMatrix
coverDir = filepath.Join(coverDir, strings.ReplaceAll(dir, string(os.PathSeparator), "--"))
if variant != 0 {
coverDir += strconv.Itoa(variant)
}
err := os.MkdirAll(coverDir, os.ModePerm)
require.NoError(t, err)
cmd.Env = append(cmd.Env, "GOCOVERDIR="+coverDir)
Expand Down
Loading