Merge pull request #2584 from tonistiigi/bake-test-fix

bake: fix testing json formatted output
This commit is contained in:
Tõnis Tiigi 2024-07-09 12:40:51 -07:00 committed by GitHub
commit 06d96d665e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1074,15 +1074,16 @@ target "another" {
require.Contains(t, out, "another") require.Contains(t, out, "another")
require.Contains(t, out, "UndefinedVar") require.Contains(t, out, "UndefinedVar")
out, err = bakeCmd( cmd := buildxCmd(
sb, sb,
withDir(dir), withDir(dir),
withArgs("build", "another", "--call", "check,format=json"), withArgs("bake", "--progress=quiet", "build", "another", "--call", "check,format=json"),
) )
require.Error(t, err, out) outB, err := cmd.Output()
require.Error(t, err, string(outB))
var res map[string]any var res map[string]any
err = json.Unmarshal([]byte(out), &res) err = json.Unmarshal(outB, &res)
require.NoError(t, err, out) require.NoError(t, err, out)
targets, ok := res["target"].(map[string]any) targets, ok := res["target"].(map[string]any)