Skip to content
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

Jump to bottom

Integration tests: fixed couldn't stat file error #3091

Merged
merged 2 commits into from
Jul 18, 2023
Merged

Integration tests: fixed couldn't stat file error #3091

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1607c86
Integration tests: fixed couldn't stat file race condition
pazone Jul 18, 2023
95cb956
Use cmd instead of async process
pazone Jul 18, 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
37 changes: 18 additions & 19 deletions pkg/testing/runner/archiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,28 @@ import (
"os/exec"
"path/filepath"
"strings"

"github.com/elastic/elastic-agent/pkg/core/process"
)

func createRepoZipArchive(ctx context.Context, dir string, dest string) error {
absDir, err := filepath.Abs(dir)
if err != nil {
return fmt.Errorf("failed to get absolute path to %s: %w", dir, err)
}
var stdout bytes.Buffer
processHandler, err := process.Start("git", process.WithContext(ctx), process.WithArgs([]string{"ls-files", "-z"}), process.WithCmdOptions(attachOut(&stdout), workDir(dir)))

projectFilesOutput, err := cmdBufferedOutput(exec.Command("git", "ls-files", "-z"), dir)
if err != nil {
return fmt.Errorf("failed to run git ls-files: %w", err)
}
processDone := <-processHandler.Wait()
if processDone.ExitCode() != 0 {
return fmt.Errorf("failed to run git ls-files: exited code %d", processDone.ExitCode())
return err
}

// Add files that are not yet tracked in git. Prevents a footcannon where someone writes code to a new file, then tests it before they add to git
processHandler, err = process.Start("git", process.WithContext(ctx), process.WithArgs([]string{"ls-files", "--exclude-standard", "-o", "-z"}), process.WithCmdOptions(attachOut(&stdout), workDir(dir)))
untrackedOutput, err := cmdBufferedOutput(exec.Command("git", "ls-files", "--exclude-standard", "-o", "-z"), dir)
if err != nil {
return fmt.Errorf("failed to run git ls-files -o: %w", err)
return err
}
processDone = <-processHandler.Wait()
if processDone.ExitCode() != 0 {
return fmt.Errorf("failed to run git ls-files -o: exited code %d", processDone.ExitCode())

_, err = io.Copy(&projectFilesOutput, &untrackedOutput)
if err != nil {
return fmt.Errorf("failed to read stdout of git ls-files -o: %w", err)
}

archive, err := os.Create(dest)
Expand All @@ -53,7 +48,7 @@ func createRepoZipArchive(ctx context.Context, dir string, dest string) error {
zw := zip.NewWriter(archive)
defer zw.Close()

s := bufio.NewScanner(&stdout)
s := bufio.NewScanner(&projectFilesOutput)
s.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
if i := strings.IndexRune(string(data), '\x00'); i >= 0 {
return i + 1, data[0:i], nil
Expand Down Expand Up @@ -105,9 +100,13 @@ func createRepoZipArchive(ctx context.Context, dir string, dest string) error {
return nil
}

func workDir(dir string) process.CmdOption {
return func(cmd *exec.Cmd) error {
cmd.Dir = dir
return nil
func cmdBufferedOutput(cmd *exec.Cmd, workDir string) (bytes.Buffer, error) {
var stdoutBuf bytes.Buffer
cmd.Dir = workDir
cmd.Stdout = &stdoutBuf
err := cmd.Run()
if err != nil {
return *bytes.NewBufferString(""), fmt.Errorf("failed to run cmd %s: %w", strings.Join(cmd.Args, " "), err)
}
return stdoutBuf, nil
}
Loading