Skip to content
Open
Changes from 2 commits
Commits
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
30 changes: 22 additions & 8 deletions tests/e2e/standalone/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"path/filepath"
"runtime"
"strings"
"sync"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -101,11 +102,25 @@ func executeAgainstRunningDapr(t *testing.T, f func(), daprArgs ...string) {
daprPath := common.GetDaprPath()

cmd := exec.Command(daprPath, daprArgs...)
reader, _ := cmd.StdoutPipe()
scanner := bufio.NewScanner(reader)
stdoutReader, _ := cmd.StdoutPipe()
stderrReader, _ := cmd.StderrPipe()
scanner := bufio.NewScanner(stdoutReader)

cmd.Start()

var wg sync.WaitGroup
var stderrOutput strings.Builder
wg.Add(1)
go func() {
defer wg.Done()
stderrScanner := bufio.NewScanner(stderrReader)
for stderrScanner.Scan() {
line := stderrScanner.Text()
t.Log(line)
stderrOutput.WriteString(line)
}
}()

daprOutput := ""
for scanner.Scan() {
outputChunk := scanner.Text()
Expand All @@ -116,22 +131,21 @@ func executeAgainstRunningDapr(t *testing.T, f func(), daprArgs ...string) {
daprOutput += outputChunk
}

wg.Wait()
daprOutput += stderrOutput.String()

err := cmd.Wait()
hasAppCommand := !strings.Contains(daprOutput, "WARNING: no application command found")
if err != nil {
var exitErr *exec.ExitError
if errors.As(err, &exitErr) && exitErr.ExitCode() == 1 &&
strings.Contains(daprOutput, "Exited Dapr successfully") &&
(!hasAppCommand || strings.Contains(daprOutput, "Exited App successfully")) {
!strings.Contains(daprOutput, "The App process exited with error") {
err = nil
}
}
require.NoError(t, err, "dapr didn't exit cleanly")
assert.NotContains(t, daprOutput, "The App process exited with error code: exit status", "Stop command should have been called before the app had a chance to exit")
assert.NotContains(t, daprOutput, "The App process exited with error", "Stop command should have been called before the app had a chance to exit")
assert.Contains(t, daprOutput, "Exited Dapr successfully")
if hasAppCommand {
assert.Contains(t, daprOutput, "Exited App successfully")
}
}

// ensureDaprInstallation ensures that Dapr is installed.
Expand Down
Loading