Skip to content

Commit 9177f50

Browse files
authored
test: re-enable and fix test case for getVersion (#1246)
1 parent 8cd85e4 commit 9177f50

File tree

2 files changed

+22
-38
lines changed

2 files changed

+22
-38
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
go-version:
15+
- 1.22
1516
- oldstable
1617
- stable
1718
steps:

cli/main_test.go

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cli
22

33
import (
4+
goversion "go/version"
45
"os"
56
"path/filepath"
67
"runtime"
@@ -96,45 +97,27 @@ func TestXDGConfigDirNoFile(t *testing.T) {
9697
}
9798

9899
func TestGetVersion(t *testing.T) {
99-
tests := []struct {
100-
name string
101-
version string
102-
commit string
103-
date string
104-
builtBy string
105-
want string
106-
}{
107-
// TODO re-activate the testcase
108-
/*
109-
{
110-
name: "Development version",
111-
version: defaultVersion,
112-
commit: defaultCommit,
113-
date: defaultDate,
114-
builtBy: defaultBuilder,
115-
want: "version \n",
116-
},
117-
*/
118-
{
119-
name: "Release version",
120-
version: "v1.5.0-12-g7ee4500-dev",
121-
commit: "7ee4500e125e2d1b12653b2c8e140fec380919b4",
122-
date: "2024-11-15 10:52 UTC",
123-
builtBy: "builder",
124-
want: `Version: v1.5.0-12-g7ee4500-dev
100+
t.Run("Development version", func(t *testing.T) {
101+
got := getVersion(defaultBuilder, defaultDate, defaultCommit, defaultVersion)
102+
want := "version (devel)\n"
103+
if goversion.Compare(runtime.Version(), "go1.24") < 0 {
104+
want = "version \n"
105+
}
106+
107+
if got != want {
108+
t.Errorf("getVersion() = %q, want %q", got, want)
109+
}
110+
})
111+
112+
t.Run("Release version", func(t *testing.T) {
113+
got := getVersion("builder", "2024-11-15 10:52 UTC", "7ee4500e125e2d1b12653b2c8e140fec380919b4", "v1.5.0-12-g7ee4500-dev")
114+
want := `Version: v1.5.0-12-g7ee4500-dev
125115
Commit: 7ee4500e125e2d1b12653b2c8e140fec380919b4
126116
Built 2024-11-15 10:52 UTC by builder
127-
`,
128-
},
129-
}
117+
`
130118

131-
for _, tt := range tests {
132-
t.Run(tt.name, func(t *testing.T) {
133-
got := getVersion(tt.builtBy, tt.date, tt.commit, tt.version)
134-
135-
if got != tt.want {
136-
t.Errorf("getVersion() = %q, want %q", got, tt.want)
137-
}
138-
})
139-
}
119+
if got != want {
120+
t.Errorf("getVersion() = %q, want %q", got, want)
121+
}
122+
})
140123
}

0 commit comments

Comments
 (0)