Skip to content

assert: refactor Test*FileExists and Test*DirExists tests to enable parallel testing #1766

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
dolmen merged 3 commits into from
Jun 30, 2025
Merged

assert: refactor Test*FileExists and Test*DirExists tests to enable parallel testing #1766

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d912549
assert/tests: enable parallel testing for Test{,No}{File,Dir}Exists
dolmen Jun 16, 2025
50277a8
assert/tests: simplify Test{No,}{File,Dir}Exists
dolmen Jun 16, 2025
44c0281
assert/tests: improve failure reporting in Test{No,}{File,Dir}Exists
dolmen Jun 16, 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
104 changes: 19 additions & 85 deletions assert/assertions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2579,7 +2579,7 @@ func TestNotZero(t *testing.T) {
}

func TestFileExists(t *testing.T) {
// FIXME t.Parallel()
t.Parallel()

mockT := new(testing.T)
True(t, FileExists(mockT, "assertions.go"))
Expand All @@ -2590,32 +2590,17 @@ func TestFileExists(t *testing.T) {
mockT = new(testing.T)
False(t, FileExists(mockT, "../_codegen"))

var tempFiles []string

link, err := getTempSymlinkPath("assertions.go")
if err != nil {
t.Fatal("could not create temp symlink, err:", err)
}
tempFiles = append(tempFiles, link)
link := getTempSymlinkPath(t, "assertions.go")
mockT = new(testing.T)
True(t, FileExists(mockT, link))

link, err = getTempSymlinkPath("non_existent_file")
if err != nil {
t.Fatal("could not create temp symlink, err:", err)
}
tempFiles = append(tempFiles, link)
link = getTempSymlinkPath(t, "non_existent_file")
mockT = new(testing.T)
True(t, FileExists(mockT, link))

errs := cleanUpTempFiles(tempFiles)
if len(errs) > 0 {
t.Fatal("could not clean up temporary files")
}
}

func TestNoFileExists(t *testing.T) {
// FIXME t.Parallel()
t.Parallel()

mockT := new(testing.T)
False(t, NoFileExists(mockT, "assertions.go"))
Expand All @@ -2626,49 +2611,28 @@ func TestNoFileExists(t *testing.T) {
mockT = new(testing.T)
True(t, NoFileExists(mockT, "../_codegen"))

var tempFiles []string

link, err := getTempSymlinkPath("assertions.go")
if err != nil {
t.Fatal("could not create temp symlink, err:", err)
}
tempFiles = append(tempFiles, link)
link := getTempSymlinkPath(t, "assertions.go")
mockT = new(testing.T)
False(t, NoFileExists(mockT, link))

link, err = getTempSymlinkPath("non_existent_file")
if err != nil {
t.Fatal("could not create temp symlink, err:", err)
}
tempFiles = append(tempFiles, link)
link = getTempSymlinkPath(t, "non_existent_file")
mockT = new(testing.T)
False(t, NoFileExists(mockT, link))

errs := cleanUpTempFiles(tempFiles)
if len(errs) > 0 {
t.Fatal("could not clean up temporary files")
}
}

func getTempSymlinkPath(file string) (string, error) {
link := file + "_symlink"
err := os.Symlink(file, link)
return link, err
}
func getTempSymlinkPath(t *testing.T, file string) string {
Copy link
Copy Markdown
Contributor

@alexandear alexandear Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can improve naming:

Suggested change
func getTempSymlinkPath(t *testing.T, file string) string {
func tempSymlinkPath(t *testing.T, file string) string {

t.Helper()

func cleanUpTempFiles(paths []string) []error {
var res []error
for _, path := range paths {
err := os.Remove(path)
if err != nil {
res = append(res, err)
}
tempDir := t.TempDir()
link := filepath.Join(tempDir, file+"_symlink")
if err := os.Symlink(file, link); err != nil {
t.Fatalf("could not create temp symlink %q pointing to %q: %v", link, file, err)
}
return res
return link
}

func TestDirExists(t *testing.T) {
// FIXME t.Parallel()
t.Parallel()

mockT := new(testing.T)
False(t, DirExists(mockT, "assertions.go"))
Expand All @@ -2679,32 +2643,17 @@ func TestDirExists(t *testing.T) {
mockT = new(testing.T)
True(t, DirExists(mockT, "../_codegen"))

var tempFiles []string

link, err := getTempSymlinkPath("assertions.go")
if err != nil {
t.Fatal("could not create temp symlink, err:", err)
}
tempFiles = append(tempFiles, link)
link := getTempSymlinkPath(t, "assertions.go")
mockT = new(testing.T)
False(t, DirExists(mockT, link))

link, err = getTempSymlinkPath("non_existent_dir")
if err != nil {
t.Fatal("could not create temp symlink, err:", err)
}
tempFiles = append(tempFiles, link)
link = getTempSymlinkPath(t, "non_existent_dir")
mockT = new(testing.T)
False(t, DirExists(mockT, link))

errs := cleanUpTempFiles(tempFiles)
if len(errs) > 0 {
t.Fatal("could not clean up temporary files")
}
}

func TestNoDirExists(t *testing.T) {
// FIXME t.Parallel()
t.Parallel()

mockT := new(testing.T)
True(t, NoDirExists(mockT, "assertions.go"))
Expand All @@ -2715,28 +2664,13 @@ func TestNoDirExists(t *testing.T) {
mockT = new(testing.T)
False(t, NoDirExists(mockT, "../_codegen"))

var tempFiles []string

link, err := getTempSymlinkPath("assertions.go")
if err != nil {
t.Fatal("could not create temp symlink, err:", err)
}
tempFiles = append(tempFiles, link)
link := getTempSymlinkPath(t, "assertions.go")
mockT = new(testing.T)
True(t, NoDirExists(mockT, link))

link, err = getTempSymlinkPath("non_existent_dir")
if err != nil {
t.Fatal("could not create temp symlink, err:", err)
}
tempFiles = append(tempFiles, link)
link = getTempSymlinkPath(t, "non_existent_dir")
mockT = new(testing.T)
True(t, NoDirExists(mockT, link))

errs := cleanUpTempFiles(tempFiles)
if len(errs) > 0 {
t.Fatal("could not clean up temporary files")
}
}

func TestJSONEq_EqualSONString(t *testing.T) {
Expand Down