Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit ffdb5ce

Browse files
author
Matthieu Nottale
committed
version: Dump config. e2e: exposes hasExperimental for future use.
Signed-off-by: Matthieu Nottale <[email protected]>
1 parent f41797c commit ffdb5ce

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

e2e/binary_test.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"os/exec"
1010
"path/filepath"
1111
"runtime"
12+
"strings"
1213
"testing"
1314

1415
"github.com/gotestyourself/gotestyourself/assert"
@@ -18,22 +19,24 @@ import (
1819
)
1920

2021
var (
21-
dockerApp = ""
22+
dockerApp = ""
23+
hasExperimental = false
2224
)
2325

24-
func getBinary(t *testing.T) string {
26+
func getBinary(t *testing.T) (string, bool) {
2527
if dockerApp != "" {
26-
return dockerApp
28+
return dockerApp, hasExperimental
2729
}
2830
binName := findBinary()
2931
if binName == "" {
3032
t.Error("cannot locate docker-app binary")
3133
}
3234
cmd := exec.Command(binName, "version")
33-
err := cmd.Run()
35+
output, err := cmd.CombinedOutput()
3436
assert.NilError(t, err, "failed to execute %s", binName)
3537
dockerApp = binName
36-
return dockerApp
38+
hasExperimental = strings.Contains(string(output), "Experimental: on")
39+
return dockerApp, hasExperimental
3740
}
3841

3942
func findBinary() string {

internal/version.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ var (
1616
// FullVersion returns a string of version information.
1717
func FullVersion() string {
1818
res := []string{
19-
fmt.Sprintf("Version: %s", Version),
20-
fmt.Sprintf("Git commit: %s", GitCommit),
21-
fmt.Sprintf("OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH),
19+
fmt.Sprintf("Version: %s", Version),
20+
fmt.Sprintf("Git commit: %s", GitCommit),
21+
fmt.Sprintf("OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH),
22+
fmt.Sprintf("Experimental: %s", Experimental),
23+
fmt.Sprintf("Renderers: %s", Renderers),
2224
}
2325
return strings.Join(res, "\n")
2426
}

0 commit comments

Comments
 (0)