fix tests

This commit is contained in:
Bryce Lampe
2024-04-26 11:49:50 -07:00
parent 63ca9973ae
commit f2e43df5af
3 changed files with 43 additions and 11 deletions

View File

@@ -17,6 +17,8 @@ package internal
import (
"bytes"
"context"
"io"
"log/slog"
"os"
"path/filepath"
"testing"
@@ -352,13 +354,23 @@ func TestNormalizeReference(t *testing.T) {
}
}
//nolint:paralleltest // Overrides default logger.
func TestBuildError(t *testing.T) {
t.Parallel()
if os.Getenv("CI") != "" {
t.Skip("flaky on CI for some reason")
}
l := slog.Default()
defer slog.SetDefault(l)
// Override go-provider's default logger to capture and tee to stdout.
logger := &bytes.Buffer{}
slog.SetDefault(
slog.New(
slog.NewTextHandler(io.MultiWriter(logger, os.Stdout), nil),
),
)
exampleContext := &BuildContext{Context: Context{Location: "../../examples/app"}}
args := ImageArgs{
@@ -367,7 +379,6 @@ func TestBuildError(t *testing.T) {
Inline: "FROM alpine\nRUN echo hello\nRUN badcmd",
},
}
logged := bytes.Buffer{}
ctx := context.Background()
cli := testcli(t, true)
@@ -384,7 +395,7 @@ func TestBuildError(t *testing.T) {
}
for _, want := range want {
assert.Contains(t, logged.String(), want)
assert.Contains(t, logger.String(), want)
}
assert.ErrorContains(t, err,
`process "/bin/sh -c badcmd" did not complete successfully: exit code: 127`,

View File

@@ -59,7 +59,10 @@ func TestAnnotate(t *testing.T) {
func TestSchema(t *testing.T) {
t.Parallel()
Schema(context.Background(), "v4")
s := newServer(nil)
_, err := s.GetSchema(provider.GetSchemaRequest{Version: 0})
assert.NoError(t, err)
}
type annotator struct{}
@@ -78,5 +81,5 @@ func newServer(client Client) integration.Server {
})
}
return integration.NewServer("docker", semver.Version{Major: 4}, p)
return integration.NewServer("docker-build", semver.Version{Major: 0}, p)
}