Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-09-21 21:44:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

e2e-upgrade: guard function return values behind sync.WaitGroup (#3461)

Browse source 
Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2024-10-28 11:34:11 +01:00 • committed by GitHub
parent 132218ac1e
commit 4b7cd84eaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
e2e/internal/upgrade/upgrade.go
View file

@ -182,7 +182,8 @@ func runCommandWithSeparateOutputs(cmd *exec.Cmd) (stdout, stderr []byte, err er
return return
} }
continuouslyPrintOutput := func(r io.Reader, prefix string) { continuouslyPrintOutput := func(r io.Reader, prefix string, wg *sync.WaitGroup) {
defer wg.Done()
scanner := bufio.NewScanner(r) scanner := bufio.NewScanner(r)
for scanner.Scan() { for scanner.Scan() {
output := scanner.Text() output := scanner.Text()
@ -196,12 +197,15 @@ func runCommandWithSeparateOutputs(cmd *exec.Cmd) (stdout, stderr []byte, err er
} }
} }
go continuouslyPrintOutput(stdoutIn, "stdout") wg := &sync.WaitGroup{}
go continuouslyPrintOutput(stderrIn, "stderr") wg.Add(2)
go continuouslyPrintOutput(stdoutIn, "stdout", wg)
go continuouslyPrintOutput(stderrIn, "stderr", wg)
if err = cmd.Wait(); err != nil { if err = cmd.Wait(); err != nil {
err = fmt.Errorf("wait for command to finish: %w", err) err = fmt.Errorf("wait for command to finish: %w", err)
} }
wg.Wait()
return stdout, stderr, err return stdout, stderr, err
} }