Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 21 additions & 3 deletions integration/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package integration_helpers
import (
"errors"
"fmt"
"strings"
"testing"

"github.com/paketo-buildpacks/occam"
Expand Down Expand Up @@ -76,24 +77,41 @@ type RetryBuild struct {
retry int
}

type LogList []fmt.Stringer

func (l LogList) String() string {
var builder strings.Builder

for index, value := range l {
if index > 0 {
builder.WriteString("\n")
}
builder.WriteString(value.String())
}

return builder.String()
}

func (r *RetryBuild) Execute(packBuild occam.PackBuild, name string, source string) (occam.Image, fmt.Stringer, error) {
var image occam.Image
var logs fmt.Stringer
var allLogs LogList
var errs error

for i := range r.retry + 1 {
if i > 0 {
r.t.Logf("Retry %v\n", i)
}
var err error
var logs fmt.Stringer
image, logs, err = packBuild.Execute(name, source)
allLogs = append(allLogs, logs)
if err == nil {
return image, logs, err
return image, allLogs, err
} else {
errs = errors.Join(errs, err)
r.t.Logf("Build failed: %v\n", err)
}
}

return image, logs, errs
return image, allLogs, errs
}
3 changes: 2 additions & 1 deletion integration/installers/miniconda_default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ func minicondaTestDefault(t *testing.T, context spec.G, it spec.S) {
WithBuildpacks(
settings.Buildpacks.PythonInstallers.Online,
settings.Buildpacks.BuildPlan.Online,
),
).
WithClearCache(),
name,
source,
)
Expand Down
Loading