Skip to content

test: cleanup gazelle tests and run them in parallel #1159

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
f0rmiga merged 3 commits into from
Apr 10, 2023
Merged

test: cleanup gazelle tests and run them in parallel #1159

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a865228
refactor: define inputs and goldens on the same line
aignas Apr 9, 2023
0cfa05b
refactor: reduce indentation by early returns
aignas Apr 9, 2023
8cd3990
feat: run tests in parallel and use t.Cleanup
aignas Apr 9, 2023
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
54 changes: 30 additions & 24 deletions gazelle/python/python_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ func TestGazelleBinary(t *testing.T) {

func testPath(t *testing.T, name string, files []bazel.RunfileEntry) {
t.Run(name, func(t *testing.T) {
var inputs []testtools.FileSpec
var goldens []testtools.FileSpec
t.Parallel()
var inputs, goldens []testtools.FileSpec

var config *testYAML
for _, f := range files {
Expand Down Expand Up @@ -111,43 +111,49 @@ func testPath(t *testing.T, name string, files []bazel.RunfileEntry) {
Path: filepath.Join(name, strings.TrimSuffix(shortPath, ".in")),
Content: string(content),
})
} else if strings.HasSuffix(shortPath, ".out") {
continue
}

if strings.HasSuffix(shortPath, ".out") {
goldens = append(goldens, testtools.FileSpec{
Path: filepath.Join(name, strings.TrimSuffix(shortPath, ".out")),
Content: string(content),
})
} else {
inputs = append(inputs, testtools.FileSpec{
Path: filepath.Join(name, shortPath),
Content: string(content),
})
goldens = append(goldens, testtools.FileSpec{
Path: filepath.Join(name, shortPath),
Content: string(content),
})
continue
}

inputs = append(inputs, testtools.FileSpec{
Path: filepath.Join(name, shortPath),
Content: string(content),
})
goldens = append(goldens, testtools.FileSpec{
Path: filepath.Join(name, shortPath),
Content: string(content),
})
}

testdataDir, cleanup := testtools.CreateFiles(t, inputs)
defer cleanup()
defer func() {
if t.Failed() {
filepath.Walk(testdataDir, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
t.Logf("%q exists", strings.TrimPrefix(path, testdataDir))
return nil
})
t.Cleanup(cleanup)
t.Cleanup(func() {
if !t.Failed() {
return
}
}()

filepath.Walk(testdataDir, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
t.Logf("%q exists", strings.TrimPrefix(path, testdataDir))
return nil
})
})

workspaceRoot := filepath.Join(testdataDir, name)

args := []string{"-build_file_name=BUILD,BUILD.bazel"}

ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
t.Cleanup(cancel)
cmd := exec.CommandContext(ctx, gazellePath, args...)
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
Expand Down